7 files changed, 37 insertions, 28 deletions
diff --git a/microkernel/mach/gnu_mach/building.mdwn b/microkernel/mach/gnu_mach/building.mdwn
index ef0d8553..073c68a3 100644
--- a/microkernel/mach/gnu_mach/building.mdwn
+++ b/microkernel/mach/gnu_mach/building.mdwn
@@ -47,7 +47,7 @@ package:
 
 Apart from the case that you only want to install GNU Mach's header files (see
 below), building GNU Mach requires you to have the Mach Interface Generator
-installed.  See [[building_MIG|mig/building]] about how to do that, then come
+installed.  See [[building_MIG|mig/gnu_mig/building]] about how to do that, then come
 back here.
 
 Additionally, building GNU Mach requires a C compiler, a standard C library and
diff --git a/microkernel/mach/mig.mdwn b/microkernel/mach/mig.mdwn
index 5f09621d..eb1c0906 100644
--- a/microkernel/mach/mig.mdwn
+++ b/microkernel/mach/mig.mdwn
@@ -12,11 +12,11 @@ is included in the section entitled
 The Mach Interface Generator (MIG) is an [[IDL]] compiler.  Based on an
 interface definition, it creates stubs to [[invoke]] object methods
 and to demultiplex incoming messages.  These stubs conveniently hide
-the details of Mach's [[IPC]] machinery.
+the details of Mach's [[IPC]] machinery and make it easy to implement
+and use Mach [[interface]]s as [[remote_procedure_calls_(RPC)|rpc]].
 
-GNU MIG is fully compatible with OSF MIG.
-
-* MIG's [homepage](http://www.gnu.org/software/hurd/mig.html)
 * [[Documentation]]
-* [[Building]] - Building (and obtaining) MIG
-* [[Open_Issues]]
+
+# Implementations
+
+  * [[GNU_MIG]]
diff --git a/microkernel/mach/mig/discussion.mdwn b/microkernel/mach/mig/discussion.mdwn
deleted file mode 100644
index fdab3a45..00000000
--- a/microkernel/mach/mig/discussion.mdwn
+++ /dev/null
@@ -1,17 +0,0 @@
-Created
-
--- [[Main/JoachimNilsson]] - 29 Oct 2002
-
-The logo seems very programmer friendly as this web topic is intended.
-
--- [[Main/GrantBow]] - 15 Nov 2002
-
-There's little traffic here and little content. Perhaps we should just remove this web? It seemed like a good idea to create it when we split the others off...
-
--- [[Main/GrantBow]] - 22 Dec 2002
-
-Maybe, but not yet. Let's keep it for a while longer - say, three months. 1st April 2003. If the traffic still is low then we move the Mig topics to the Mach web ...
-
-...Mig = **Mach** Interface Generator.
-
--- [[Main/JoachimNilsson]] - 22 Dec 2002
diff --git a/microkernel/mach/mig/gnu_mig.mdwn b/microkernel/mach/mig/gnu_mig.mdwn
new file mode 100644
index 00000000..4f5fb5c8
--- /dev/null
+++ b/microkernel/mach/mig/gnu_mig.mdwn
@@ -0,0 +1,24 @@
+[[meta copyright="Copyright © 2001, 2006, 2008 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]]."]]"""]]
+
+GNU MIG is the GNU distribution of the
+[[Mach_3.0_interface_generator_*MIG*|mig]], as maintained by the GNU Hurd
+developers for the GNU project.
+
+You need this tool to compile the GNU Mach and GNU Hurd distributions, and to
+compile the GNU C library for the Hurd.  Also, you will need it for other
+software in the GNU system that uses Mach-based
+[[inter-process_communication|ipc]].
+
+GNU MIG is fully compatible with [[OSF_MIG|mig]].
+
+  * [[Building]] - building (and obtaining) GNU MIG
+  * [[Open_Issues]]
diff --git a/microkernel/mach/mig/building.mdwn b/microkernel/mach/mig/gnu_mig/building.mdwn
index 2ec75e38..8b553b6b 100644
--- a/microkernel/mach/mig/building.mdwn
+++ b/microkernel/mach/mig/gnu_mig/building.mdwn
@@ -4,7 +4,8 @@ If you want to build the Mach Interface Generator yourself instead of just using
 
 ## <a name="Getting_the_Source_Code"> Getting the Source Code </a>
 
-You can chose between getting the [sources from the developers's rcs](http://www.gnu.org/software/hurd/mig-download.html#cvs):
+You can chose between getting the [sources from the developers'
+RCS](http://savannah.gnu.org/cvs/?group=hurd):
 
     $ cvs -z3 -d:pserver:anonymous@cvs.savannah.gnu.org:/sources/hurd co mig
 
@@ -12,7 +13,7 @@ You can chose between getting the [sources from the developers's rcs](http://www
 
     $ apt-get source mig
 
-Please see the Debian [[running/debian/FAQ]] before using _apt-get source_.
+Please see the Debian [[hurd/running/debian/FAQ]] before using _apt-get source_.
 
 The unpacked source tree is around 1 MiB, and the build tree also is around 1 MiB.
 
diff --git a/microkernel/mach/mig/open_issues.mdwn b/microkernel/mach/mig/gnu_mig/open_issues.mdwn
index 2d870695..7a6233da 100644
--- a/microkernel/mach/mig/open_issues.mdwn
+++ b/microkernel/mach/mig/gnu_mig/open_issues.mdwn
@@ -13,7 +13,8 @@ is included in the section entitled
 This is a dumping ground for open issues for GNU MIG.
 
 [[inline
-pages="microkernel/mach/mig/open_issues/* and !*/discussion"
+pages="microkernel/mach/mig/gnu_mig/open_issues/* and !*/discussion"
 show=0
 actions=yes
-rootpage="microkernel/mach/mig/open_issues" postformtext="Add a new item titled:"]]
+rootpage="microkernel/mach/mig/gnu_mig/open_issues"
+postformtext="Add a new item titled:"]]
diff --git a/microkernel/mach/mig/open_issues/duplicate_inclusion_guards.mdwn b/microkernel/mach/mig/gnu_mig/open_issues/duplicate_inclusion_guards.mdwn
index 93347759..93347759 100644
--- a/microkernel/mach/mig/open_issues/duplicate_inclusion_guards.mdwn
+++ b/microkernel/mach/mig/gnu_mig/open_issues/duplicate_inclusion_guards.mdwn