Integrate some more pages.

15 files changed, 18 insertions, 24 deletions

diff --git a/Hurd/InstallNotes.mdwn b/Hurd/InstallNotes.mdwn
index a3fbc28e..a627ca55 100644
--- a/Hurd/InstallNotes.mdwn
+++ b/Hurd/InstallNotes.mdwn
@@ -234,7 +234,7 @@ To mount this from a GNU box:
 
 ## <a name="8_Final_Words_The_FAQ"> </a> 8. Final Words - The FAQ
 
-* [[FrequentlyAskedQuestions]] - More than frequently asked questions
+* [[FAQ]] - More than frequently asked questions
 
 * [Hurd FAQ](http://web.walfield.org/papers/hurd-faq/)
 
diff --git a/Hurd/discussion.mdwn b/Hurd/discussion.mdwn
deleted file mode 100644
index 2bd3d93f..00000000
--- a/Hurd/discussion.mdwn
+++ /dev/null
@@ -1,13 +0,0 @@
-## <a name="Hurd_Web_Meta_Discussions"> Hurd Web Meta Discussions </a>
-
-Old discussions: [[WIKIHOMEURLHurdWebDiscussrev16]] | [[WIKIHOMEURLTWikiTWikiDiscussrev161]]
-
-This is an area to talk about how these pages are put together, edited and arranged. Without organization the navigation of the site could become unusable.
-
-Please add your comments below and then your signature, Blog style.
-
-----
-
-I cleaned up the rest of [[WebHome]] as well.
-
--- [[Main/JoachimNilsson]] - 03 Feb 2003
diff --git a/Hurd/contributing.mdwn b/hurd/contributing.mdwn
index d86923f8..819d354b 100644
--- a/Hurd/contributing.mdwn
+++ b/hurd/contributing.mdwn
@@ -50,5 +50,6 @@ See the [[ToDo]].
 
 # GNU Mach
 
-GNU Mach is the underlying microkernel used by the Hurd.  It has
-a number of deficencies; [[mach/gnumach/RevivalProject]].
+[[GNU_Mach|microkernel/mach/gnumach]] is the underlying microkernel used by the
+Hurd.  It has a number of deficencies;
+[[microkernel/mach/gnumach/RevivalProject]].
diff --git a/Hurd/debbuging.mdwn b/hurd/debbuging.mdwn
index 20446b6e..20446b6e 100644
--- a/Hurd/debbuging.mdwn
+++ b/hurd/debbuging.mdwn
diff --git a/Hurd/FrequentlyAskedQuestions.mdwn b/hurd/faq.mdwn
index 0bcb4e79..0bcb4e79 100644
--- a/Hurd/FrequentlyAskedQuestions.mdwn
+++ b/hurd/faq.mdwn
diff --git a/Hurd/gettinghelp.mdwn b/hurd/gettinghelp.mdwn
index f7313906..b3bbcbf6 100644
--- a/Hurd/gettinghelp.mdwn
+++ b/hurd/gettinghelp.mdwn
@@ -17,7 +17,7 @@ redistribute your contributions.
 
 # Essential Documentation
 
-* [[FrequentlyAskedQuestions]]
+* [[FAQ]]
 * [[microkernel/mach/gnumach/HardwareCompatibilityList]]
 
 # Forums
diff --git a/Hurd/history.mdwn b/hurd/history.mdwn
index 1b45d25f..1b45d25f 100644
--- a/Hurd/history.mdwn
+++ b/hurd/history.mdwn
diff --git a/Hurd/NeighborHurd.mdwn b/hurd/neighborhurd.mdwn
index b4d25586..b4d25586 100644
--- a/Hurd/NeighborHurd.mdwn
+++ b/hurd/neighborhurd.mdwn
diff --git a/Hurd/noninvasivedebugging.mdwn b/hurd/noninvasivedebugging.mdwn
index f2ab8489..f2ab8489 100644
--- a/Hurd/noninvasivedebugging.mdwn
+++ b/hurd/noninvasivedebugging.mdwn
diff --git a/hurd/running/debian/DebianFAQ.mdwn b/hurd/running/debian/DebianFAQ.mdwn
index 83386c91..43ace701 100644
--- a/hurd/running/debian/DebianFAQ.mdwn
+++ b/hurd/running/debian/DebianFAQ.mdwn
@@ -1,6 +1,6 @@
 # <a name="Debian_GNU_Hurd_FAQ"> </a> Debian GNU/Hurd FAQ
 
-See also [[Hurd/FrequentlyAskedQuestions]] and [[DebianAfterInstall]]
+See also [[hurd/FAQ]] and [[DebianAfterInstall]]
 
 ## <a name="df"> df </a>
 
diff --git a/Hurd/ToDo.mdwn b/hurd/todo.mdwn
index 2d65f0c8..2d65f0c8 100644
--- a/Hurd/ToDo.mdwn
+++ b/hurd/todo.mdwn
diff --git a/hurd/ibac.mdwn b/ibac.mdwn
index 4aa4f70e..4aa4f70e 100644
--- a/hurd/ibac.mdwn
+++ b/ibac.mdwn
diff --git a/index.mdwn b/index.mdwn
index 3a512533..40ef4b13 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -31,7 +31,7 @@ package from Debian experimental fixed this for me.  -->
 
 ## Getting Help
 
-There are a couple of different [[Hurd_FAQs|Hurd/FrequentlyAskedQuestions]].
+There are a couple of different [[Hurd_FAQs|hurd/FAQ]].
 There are a number of [[IRC_channels|IRC]] and several
 different [[mailing_lists|MailingLists]] with searchable archives.
 
diff --git a/sidebar.mdwn b/sidebar.mdwn
index 4840ac70..34995a8a 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -21,14 +21,20 @@ redistribute your contributions.
 
 ---
 
-* **[[Hurd]]**[[if test="destpage(Hurd*)" then="
+* **[[Hurd]]**[[if test="destpage(hurd*)" then="
   * *[[About|Hurd/TheGnuHurd]]*
   * *[[Status|Hurd/GNUHurdStatus]]*
   * *[[Hurd/Documentation]]*
   * *[[hurd/Running]]*"]]
-  * **[[Debian_GNU/Hurd|hurd/running/debian]]**
-  * **[[GNU_system|hurd/running/gnu]]**
-  * **[[HurdNG|hurd/ng]]**
 * **[[microkernel/Mach]]**[[if test="destpage(microkernel/mach*)" then="
   * *[[GNU_Mach|microkernel/mach/gnumach]]*
   * *[[microkernel/mach/Documentation]]*"]]
+
+---
+
+* **[[Debian_GNU/Hurd|hurd/running/debian]]**
+* **[[GNU_system|hurd/running/gnu]]**
+
+---
+
+* **[[HurdNG|hurd/ng]]**
diff --git a/unsorted/InstallNotes.mdwn b/unsorted/InstallNotes.mdwn
index 418caca1..49dcd53d 100644
--- a/unsorted/InstallNotes.mdwn
+++ b/unsorted/InstallNotes.mdwn
@@ -235,7 +235,7 @@ See [[DebianAfterInstall]] for complete, up to date instructions.
 
 ## <a name="8_Final_Words_The_FAQ"> </a> 8. Final Words - The FAQ
 
-* [[FrequentlyAskedQuestions]] - More than frequently asked questions
+* [[FAQ]] - More than frequently asked questions
 
 * [Hurd FAQ](http://web.walfield.org/papers/hurd-faq/)