Revert "microkernel/mach/gnumach -> microkernel/mach/gnu_mach"

This reverts commit ae9e4e22a7ce8b2b56e98ff1708c2e8d42eefd69.  I've changed my
mind again.  Also resolve conflicts and adapt all new uses of the path.

29 files changed, 20 insertions, 20 deletions

diff --git a/community/gsoc/project_ideas.mdwn b/community/gsoc/project_ideas.mdwn
index 8f2fe385..c4b665b7 100644
--- a/community/gsoc/project_ideas.mdwn
+++ b/community/gsoc/project_ideas.mdwn
@@ -340,7 +340,7 @@ GSoC 2008. He is still working on some outstanding issues.
 
 Although a driver framework in userspace would be desirable, presently the Hurd
 uses kernel drivers in the microkernel,
-[[microkernel/mach/GNU_Mach]]. (And changing this would be far beyond a
+[[GNU_Mach|microkernel/mach/gnumach]]. (And changing this would be far beyond a
 GSoC project...)
 
 The problem is that the drivers in GNU Mach are presently old Linux drivers
@@ -590,7 +590,7 @@ pthreads.
 
 The Hurd presently has no sound support.  Fixing this, [[GNU_Savannah_task
 5485]], requires two steps: the first is to port some other kernel's drivers to
-[[microkernel/mach/GNU_Mach]] so we can get access to actual sound
+[[GNU_Mach|microkernel/mach/gnumach]] so we can get access to actual sound
 hardware.  The second is to implement a userspace server ([[hurd/translator]]),
 that implements an interface on top of the kernel device that can be used by
 applications -- probably OSS or maybe ALSA.
@@ -741,7 +741,7 @@ directories and attaching other translators.
 
 Although there are some attempts to move to a more modern microkernel
 alltogether, the current Hurd implementation is based on
-[[microkernel/mach/GNU_Mach]], which is only a slightly modified
+[[GNU_Mach|microkernel/mach/gnumach]], which is only a slightly modified
 variant of the original CMU [[microkernel/Mach]].
 
 Unfortunately, Mach was created about two decades ago, and is in turn based on
diff --git a/contributing.mdwn b/contributing.mdwn
index aac255bd..a647382a 100644
--- a/contributing.mdwn
+++ b/contributing.mdwn
@@ -33,7 +33,7 @@ There are essential two kinds of Hurd system designs.
 ## Hurd on Mach
 
 For one there's the implementation of the *[[Hurd]] running on the
-[[microkernel/mach/GNU_Mach]] microkernel*.  This is what is commonly
+[[GNU_Mach_microkernel|microkernel/mach/gnumach]]*.  This is what is commonly
 meant when people are talking about GNU/Hurd systems.
 
 This system has mostly been designed and implemented
@@ -84,8 +84,8 @@ Here is a [[list_of_open_issues|hurd/open_issues]] for the [[GNU_Hurd|hurd]].
 
 ### Open Issues: GNU Mach
 
-Here is a [[list_of_open_issues|microkernel/mach/gnu_mach/open_issues]] for
-[[microkernel/mach/GNU_Mach]].
+Here is a [[list_of_open_issues|microkernel/mach/gnumach/open_issues]] for
+[[GNU_Mach|microkernel/mach/gnumach]].
 
 ### Open Issues: GNU MIG
 
diff --git a/hurd/building/cross-compiling.mdwn b/hurd/building/cross-compiling.mdwn
index 81303b0a..b007928c 100644
--- a/hurd/building/cross-compiling.mdwn
+++ b/hurd/building/cross-compiling.mdwn
@@ -98,7 +98,7 @@ guarantee is given.  Always the preferred version is listed first.
         `gcc-4_3-branch` needs.
         -->
 
-* `src/gnumach`: [[microkernel/mach/GNU_Mach]]
+* `src/gnumach`: [[GNU_Mach|microkernel/mach/gnumach]]
 
     * CVS `gnumach-1-branch`
 
diff --git a/hurd/getting_help.mdwn b/hurd/getting_help.mdwn
index c4f80ff9..342410dd 100644
--- a/hurd/getting_help.mdwn
+++ b/hurd/getting_help.mdwn
@@ -11,7 +11,7 @@ is included in the section entitled
 # Essential Documentation
 
 * [[FAQ]]
-* [[microkernel/mach/gnu_mach/Hardware_Compatibility_List]]
+* [[microkernel/mach/gnumach/Hardware_Compatibility_List]]
 
 # Forums
 
diff --git a/hurd/libstore.mdwn b/hurd/libstore.mdwn
index 3de42be3..ab649ebc 100644
--- a/hurd/libstore.mdwn
+++ b/hurd/libstore.mdwn
@@ -9,7 +9,7 @@ is included in the section entitled
 [[GNU_Free_Documentation_License|/fdl]]."]]"""]]
 
 `libstore` is more than just a thin layer between
-[[microkernel/mach/GNU_Mach]] devices (`hd0` for example) and the
+[[GNU_Mach|microkernel/mach/gnumach]] devices (`hd0` for example) and the
 device node below `/dev`...
 
 # Available Stores
diff --git a/hurd/running.mdwn b/hurd/running.mdwn
index 78815099..162bc9ea 100644
--- a/hurd/running.mdwn
+++ b/hurd/running.mdwn
@@ -9,7 +9,7 @@ is included in the section entitled
 [[GNU_Free_Documentation_License|/fdl]]."]]"""]]
 
 * [[Distrib]] - Distributions based on the Hurd
-* [[microkernel/mach/gnu_mach/ports/Xen]] - In Xen
+* [[microkernel/mach/gnumach/ports/Xen]] - In Xen
 * [[Live_CD]]
 * [[QEMU]] - In QEMU
 * [[vmware]] (**non-free!**)
diff --git a/microkernel/mach.mdwn b/microkernel/mach.mdwn
index 9d3289b4..39d0f4d2 100644
--- a/microkernel/mach.mdwn
+++ b/microkernel/mach.mdwn
@@ -7,7 +7,7 @@ microkernel currently used by the [[Hurd]].
 
 # Implementations
 
-* [[GNU_Mach]]
+* [[GNU_Mach|gnumach]]
 * [[Mach/OskitMach]] - A Once Successor of Mach based on OSKit
 * [Apple's Darwin](http://developer.apple.com/darwin/) ([API](http://developer.apple.com/documentation/Darwin/Conceptual/KernelProgramming/index.html)) (**non-free**)
 
diff --git a/microkernel/mach/documentation.mdwn b/microkernel/mach/documentation.mdwn
index f6f2eb79..b4187f78 100644
--- a/microkernel/mach/documentation.mdwn
+++ b/microkernel/mach/documentation.mdwn
@@ -12,7 +12,7 @@ is included in the section entitled
   - [Meet Mach](http://www.stepwise.com/Articles/Technical/MeetMach.html), a
     summary of Mach's history and main concepts.
 
-  * *[[The_GNU_Mach_Reference_Manual|gnu_mach/reference_manual]]*.
+  * *[[The_GNU_Mach_Reference_Manual|gnumach/reference_manual]]*.
 
   - OSF's [Kernel Interface (ps)](ftp://ftp.cs.cmu.edu/afs/cs/project/mach/public/doc/osf/kernel_interface.ps)
     [Kernel Interface (pdf)](http://shakthimaan.com/downloads/hurd/kernel_interface.pdf) 
diff --git a/microkernel/mach/gnu_mach.mdwn b/microkernel/mach/gnumach.mdwn
index 19e1ea53..19e1ea53 100644
--- a/microkernel/mach/gnu_mach.mdwn
+++ b/microkernel/mach/gnumach.mdwn
diff --git a/microkernel/mach/gnu_mach/boot_trace.mdwn b/microkernel/mach/gnumach/boot_trace.mdwn
index a08384f0..a08384f0 100644
--- a/microkernel/mach/gnu_mach/boot_trace.mdwn
+++ b/microkernel/mach/gnumach/boot_trace.mdwn
diff --git a/microkernel/mach/gnu_mach/building.mdwn b/microkernel/mach/gnumach/building.mdwn
index 014d3e87..9c075600 100644
--- a/microkernel/mach/gnu_mach/building.mdwn
+++ b/microkernel/mach/gnumach/building.mdwn
@@ -1,9 +1,9 @@
 Additional to the following text, a further [[example]] has be posted.
 
 
-# Building [[GNU_Mach]] from Source
+# Building [[GNU_Mach|gnumach]] from Source
 
-If you want to build the [[GNU_Mach]] kernel yourself instead of just using a
+If you want to build the [[GNU_Mach|gnumach]] kernel yourself instead of just using a
 pre-built binary, follow these instructions.
 
 The unpacked source tree is around 20 MiB, and the build tree (with all drivers
@@ -65,7 +65,7 @@ Start the build process with
 
     $ dpkg-buildpackage -us -uc -b -rfakeroot
 
-[[GNU_Mach]] is now building.  To use the new kernel, you must install the
+[[GNU_Mach|gnumach]] is now building.  To use the new kernel, you must install the
 resulting `.deb` package which is located one directory above the build
 directory and has a similar name as the build directory, e.g.
 
diff --git a/microkernel/mach/gnu_mach/building/example.mdwn b/microkernel/mach/gnumach/building/example.mdwn
index 6da05c5b..6da05c5b 100644
--- a/microkernel/mach/gnu_mach/building/example.mdwn
+++ b/microkernel/mach/gnumach/building/example.mdwn
diff --git a/microkernel/mach/gnu_mach/debugging.mdwn b/microkernel/mach/gnumach/debugging.mdwn
index fa2a9d42..fa2a9d42 100644
--- a/microkernel/mach/gnu_mach/debugging.mdwn
+++ b/microkernel/mach/gnumach/debugging.mdwn
diff --git a/microkernel/mach/gnu_mach/hardware_compatibility_list.mdwn b/microkernel/mach/gnumach/hardware_compatibility_list.mdwn
index 09882467..09882467 100644
--- a/microkernel/mach/gnu_mach/hardware_compatibility_list.mdwn
+++ b/microkernel/mach/gnumach/hardware_compatibility_list.mdwn
diff --git a/microkernel/mach/gnu_mach/hardware_compatibility_list/discussion.mdwn b/microkernel/mach/gnumach/hardware_compatibility_list/discussion.mdwn
index 69ca3190..69ca3190 100644
--- a/microkernel/mach/gnu_mach/hardware_compatibility_list/discussion.mdwn
+++ b/microkernel/mach/gnumach/hardware_compatibility_list/discussion.mdwn
diff --git a/microkernel/mach/gnu_mach/open_issues.mdwn b/microkernel/mach/gnumach/open_issues.mdwn
index 433ec3ef..433ec3ef 100644
--- a/microkernel/mach/gnu_mach/open_issues.mdwn
+++ b/microkernel/mach/gnumach/open_issues.mdwn
diff --git a/microkernel/mach/gnu_mach/ports.mdwn b/microkernel/mach/gnumach/ports.mdwn
index 00cdee8c..00cdee8c 100644
--- a/microkernel/mach/gnu_mach/ports.mdwn
+++ b/microkernel/mach/gnumach/ports.mdwn
diff --git a/microkernel/mach/gnu_mach/ports/xen.mdwn b/microkernel/mach/gnumach/ports/xen.mdwn
index c492d9a0..c492d9a0 100644
--- a/microkernel/mach/gnu_mach/ports/xen.mdwn
+++ b/microkernel/mach/gnumach/ports/xen.mdwn
diff --git a/microkernel/mach/gnu_mach/ports/xen/internals.mdwn b/microkernel/mach/gnumach/ports/xen/internals.mdwn
index 09e707ea..09e707ea 100644
--- a/microkernel/mach/gnu_mach/ports/xen/internals.mdwn
+++ b/microkernel/mach/gnumach/ports/xen/internals.mdwn
diff --git a/microkernel/mach/gnu_mach/ports/xen/networking_configuration.mdwn b/microkernel/mach/gnumach/ports/xen/networking_configuration.mdwn
index 71a72bac..71a72bac 100644
--- a/microkernel/mach/gnu_mach/ports/xen/networking_configuration.mdwn
+++ b/microkernel/mach/gnumach/ports/xen/networking_configuration.mdwn
diff --git a/microkernel/mach/gnu_mach/projects.mdwn b/microkernel/mach/gnumach/projects.mdwn
index 9ace6270..9ace6270 100644
--- a/microkernel/mach/gnu_mach/projects.mdwn
+++ b/microkernel/mach/gnumach/projects.mdwn
diff --git a/microkernel/mach/gnu_mach/projects/clean_up_the_code.mdwn b/microkernel/mach/gnumach/projects/clean_up_the_code.mdwn
index 875bb8cd..875bb8cd 100644
--- a/microkernel/mach/gnu_mach/projects/clean_up_the_code.mdwn
+++ b/microkernel/mach/gnumach/projects/clean_up_the_code.mdwn
diff --git a/microkernel/mach/gnu_mach/projects/gdb_stubs.mdwn b/microkernel/mach/gnumach/projects/gdb_stubs.mdwn
index 9a11a82b..9a11a82b 100644
--- a/microkernel/mach/gnu_mach/projects/gdb_stubs.mdwn
+++ b/microkernel/mach/gnumach/projects/gdb_stubs.mdwn
diff --git a/microkernel/mach/gnu_mach/reference_manual.mdwn b/microkernel/mach/gnumach/reference_manual.mdwn
index 225ab176..225ab176 100644
--- a/microkernel/mach/gnu_mach/reference_manual.mdwn
+++ b/microkernel/mach/gnumach/reference_manual.mdwn
diff --git a/microkernel/mach/history.mdwn b/microkernel/mach/history.mdwn
index 8f4b528b..a8951737 100644
--- a/microkernel/mach/history.mdwn
+++ b/microkernel/mach/history.mdwn
@@ -41,7 +41,7 @@ Meanwhile, OSKit became unmaintained, thus posing more of a burden on than being
 In 2005 Gianluca Guida started a different attempt to use the osenv interface with minimal changes to GNU Mach 1.x, thus allowing use of the generic driver interface while importing as little of the umaintained OSKit code as possible. However, there turned out to be serious problems with OSKit, so this attempt was abandoned as well.
 
 Today, GNU Mach development focuses on the 1.x branch again -- see also this
-list of [[gnu_mach/projects]].
+list of [[gnumach/projects]].
 
 # <a name="Status_of_the_project"> Status of the project </a>
 
diff --git a/microkernel/mach/mig/documentation.mdwn b/microkernel/mach/mig/documentation.mdwn
index a0bbbe14..8afad31c 100644
--- a/microkernel/mach/mig/documentation.mdwn
+++ b/microkernel/mach/mig/documentation.mdwn
@@ -66,7 +66,7 @@ pp. 67--77."
 
 # Further Relevant Documentation
 
-  * The [[GNU_Mach_Reference_Manual|gnu_mach/reference_manual]], espacially
+  * The [[GNU_Mach_Reference_Manual|gnumach/reference_manual]], espacially
     [Chapter 4, Inter Process
     Communication](http://www.gnu.org/software/hurd/gnumach-doc/Inter-Process-Communication.html),
     which, for example, explains how the <a name="dealloc">`dealloc` flag</a>
diff --git a/microkernel/mach/mig/gnu_mig/building.mdwn b/microkernel/mach/mig/gnu_mig/building.mdwn
index 8b553b6b..f92f7dbe 100644
--- a/microkernel/mach/mig/gnu_mig/building.mdwn
+++ b/microkernel/mach/mig/gnu_mig/building.mdwn
@@ -31,7 +31,7 @@ Building the Mach Interface Generator requires the _build-essential_ and _fakero
 Building the Mach Interface Generator requires a C compiler, a standard C library (with corresponding header files) and your favourite flavor of awk (gawk), yacc (bison), lex (flex) and make.
 
 Additionally, you need to have GNU Mach's header files installed.  See
-[[mach/gnu_mach/building]] about how to do that, then come back here.
+[[mach/gnumach/building]] about how to do that, then come back here.
 
 ## <a name="Building_and_Installing"> Building and Installing </a>
 
diff --git a/news/2008-11-14.mdwn b/news/2008-11-14.mdwn
index ab8d2f24..1e2c8802 100644
--- a/news/2008-11-14.mdwn
+++ b/news/2008-11-14.mdwn
@@ -10,5 +10,5 @@ is included in the section entitled
 
 [[Samuel_Thibault|samuelthibault]] has implemented support for the PAE feature
 offered by modern x86 processors.  This largely faciliates the deployment of
-GNU/Hurd systems running as a [[Xen_domU|microkernel/mach/gnu_mach/ports/xen]]
+GNU/Hurd systems running as a [[Xen_domU|microkernel/mach/gnumach/ports/xen]]
 on top of a standard Debian GNU/Linux Xen dom0, for example.
diff --git a/sidebar.mdwn b/sidebar.mdwn
index 6a132e6d..b7acb592 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -23,7 +23,7 @@ Hurd!
       * *[[hurd/Running]]*"]]
   * **[[microkernel/Mach]]**[[if test="destpage(microkernel/mach*)" then="
       * *[[microkernel/mach/Documentation]]*
-      * *[[microkernel/mach/GNU_Mach]]*"]]
+      * *[[GNU_Mach|microkernel/mach/gnumach]]*"]]
       * *[[microkernel/mach/MIG]]*[[if test="destpage(microkernel/mach/mig*)" then="
           * [[microkernel/mach/mig/GNU_MIG]]"]]