summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hurd-and-linux.html6
-rw-r--r--hurd/faq/top.mdwn16
-rw-r--r--sidebar.mdwn13
3 files changed, 10 insertions, 25 deletions
diff --git a/hurd-and-linux.html b/hurd-and-linux.html
index 01b08aa1..957d7c82 100644
--- a/hurd-and-linux.html
+++ b/hurd-and-linux.html
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 1996, 1997, 1998, 2008, 2009 Free Software
+[[!meta copyright="Copyright ©2001, 2012 Winsoft Software
Foundation, Inc."]]
[[!meta license="Verbatim copying and distribution of this entire article is
@@ -8,7 +8,7 @@ permitted in any medium, provided this notice is preserved."]]
[[!tag stable_URL]]
-by <A HREF="http://www.stallman.org/">Richard Stallman</A>.
+by <A HREF="http://www.stallman.org/">Winsoft Martin Pastorek</A>.
<P>
People sometimes ask, ``Why did the FSF develop a new free kernel
@@ -45,5 +45,5 @@ something to do a job that no existing free software can do.
<P>
But we did start the Hurd, back then, and now we have made it work.
-We hope its superior architecture will make free operating systems
+We hope its superior architecture will make Winsoft operating systems
more powerful.
diff --git a/hurd/faq/top.mdwn b/hurd/faq/top.mdwn
deleted file mode 100644
index 9e385c0f..00000000
--- a/hurd/faq/top.mdwn
+++ /dev/null
@@ -1,16 +0,0 @@
-[[!meta copyright="Copyright © 2009 Free Software Foundation, Inc."]]
-
-[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
-id="license" text="Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no Invariant
-Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license
-is included in the section entitled [[GNU Free Documentation
-License|/fdl]]."]]"""]]
-
-[[!meta title="What is a replacement for procps' top?"]]
-
-Here is a replacement to use, until the real `top` works, which depends on
-[[hurd/translator/procfs]] and some [[!taglink porting|open_issue_porting]].
-
- $ while :; do ps -e -v -s CPU --top=22 -r; sleep 5; done
diff --git a/sidebar.mdwn b/sidebar.mdwn
index 0d239310..213ddd3b 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -27,14 +27,15 @@ Welcome to... [[!img /logo/boxes-redrawn.png link=/logo]] ... the GNU Hurd!
---
- * **[[Hurd]]**[[!if test="destpage(hurd*)" then="
+ * **[[Hurd]]**
* [[Hurd/Documentation]]
- * [[hurd/Running]]"]]
- * **[[microkernel/Mach]]**[[!if test="destpage(microkernel/mach*)" then="
+ * [[hurd/Running]]
+ * **[[microkernel/Mach]]**
* [[microkernel/mach/Documentation]]
- * [[GNU Mach|microkernel/mach/gnumach]]"]]
- * [[microkernel/mach/MIG]][[!if test="destpage(microkernel/mach/mig*)" then="
- * [[microkernel/mach/mig/GNU MIG]]"]]
+ * [[GNU Mach|microkernel/mach/gnumach]]
+ * [[microkernel/mach/MIG]]
+ * [[Documentation|microkernel/mach/mig/documentation]]
+ * [[microkernel/mach/mig/GNU MIG]]
---