Shuffle another bunch of files, related to `Distrib/' and `GNU/'.

54 files changed, 47 insertions, 35 deletions

diff --git a/Hurd.mdwn b/hurd.mdwn
index 0a453f26..6e63ec44 100644
--- a/Hurd.mdwn
+++ b/hurd.mdwn
@@ -1,3 +1,5 @@
+[[img logo.png]]
+
 [[toc ]]
 
 # Introduction
diff --git a/Hurd/WebPreferences/logo.png b/hurd/logo.png
index a892b47d..a892b47d 100644
--- a/Hurd/WebPreferences/logo.png
+++ b/hurd/logo.png
diff --git a/hurd/running/bee.mdwn b/hurd/running/bee.mdwn
new file mode 100644
index 00000000..f5eb132c
--- /dev/null
+++ b/hurd/running/bee.mdwn
@@ -0,0 +1,6 @@
+[Bee GNU/Hurd](http://bee.es.gnu.org/)
+
+Castellano distribution, pkgsrc package based.  [[BochsEmulator]] image
+available too.  They have their own
+[wiki](http://es.gnu.org/cgi-bin/beewiki.pl?Wiki_Bee_GNU) and a [mailing
+list](http://bee.es.gnu.org/?p=mail&l=en) (no archive).
diff --git a/hurd/running/debian.mdwn b/hurd/running/debian.mdwn
new file mode 100644
index 00000000..d0078cf8
--- /dev/null
+++ b/hurd/running/debian.mdwn
@@ -0,0 +1,11 @@
+[[img logo.png]]
+
+[Debian GNU/Hurd](http://www.debian.org/ports/hurd/)
+
+Official page about the Debian distribution of the GNU/Hurd system.  Some
+additional notes are at [[DebianStatus]]
+
+- [Presentation](http://people.debian.org/~mbanck/talks/hurd_lt2004/html/)
+  *Debian GNU/Hurd* by [[MichaelBanck]], LinuxTag 2004 Karlsruhe
+- [[DebianFAQ]]
+- [[DebianAfterInstall]] -- Do this to get networking, new console and X
diff --git a/Distrib/BtsFiling.mdwn b/hurd/running/debian/BtsFiling.mdwn
index 90f451a8..90f451a8 100644
--- a/Distrib/BtsFiling.mdwn
+++ b/hurd/running/debian/BtsFiling.mdwn
diff --git a/Distrib/CDNotesHome.mdwn b/hurd/running/debian/CDNotesHome.mdwn
index a154415b..a154415b 100644
--- a/Distrib/CDNotesHome.mdwn
+++ b/hurd/running/debian/CDNotesHome.mdwn
diff --git a/Distrib/CrossInstall.mdwn b/hurd/running/debian/CrossInstall.mdwn
index 9a07424e..9a07424e 100644
--- a/Distrib/CrossInstall.mdwn
+++ b/hurd/running/debian/CrossInstall.mdwn
diff --git a/Distrib/DebianAfterInstall.mdwn b/hurd/running/debian/DebianAfterInstall.mdwn
index b1f14d9a..b1f14d9a 100644
--- a/Distrib/DebianAfterInstall.mdwn
+++ b/hurd/running/debian/DebianAfterInstall.mdwn
diff --git a/Distrib/DebianAptOffline.mdwn b/hurd/running/debian/DebianAptOffline.mdwn
index 52313bf2..52313bf2 100644
--- a/Distrib/DebianAptOffline.mdwn
+++ b/hurd/running/debian/DebianAptOffline.mdwn
diff --git a/Distrib/DebianAptOffline/apt.conf.offline b/hurd/running/debian/DebianAptOffline/apt.conf.offline
index 59aed564..59aed564 100644
--- a/Distrib/DebianAptOffline/apt.conf.offline
+++ b/hurd/running/debian/DebianAptOffline/apt.conf.offline
diff --git a/Distrib/DebianDpkgArchitecture.mdwn b/hurd/running/debian/DebianDpkgArchitecture.mdwn
index c768ff4e..c768ff4e 100644
--- a/Distrib/DebianDpkgArchitecture.mdwn
+++ b/hurd/running/debian/DebianDpkgArchitecture.mdwn
diff --git a/Distrib/DebianFAQ.mdwn b/hurd/running/debian/DebianFAQ.mdwn
index 83386c91..83386c91 100644
--- a/Distrib/DebianFAQ.mdwn
+++ b/hurd/running/debian/DebianFAQ.mdwn
diff --git a/Distrib/DebianIntegrationDeveloper.mdwn b/hurd/running/debian/DebianIntegrationDeveloper.mdwn
index 8b34cb7b..8b34cb7b 100644
--- a/Distrib/DebianIntegrationDeveloper.mdwn
+++ b/hurd/running/debian/DebianIntegrationDeveloper.mdwn
diff --git a/Distrib/DebianPackages.mdwn b/hurd/running/debian/DebianPackages.mdwn
index 7e09dce0..7e09dce0 100644
--- a/Distrib/DebianPackages.mdwn
+++ b/hurd/running/debian/DebianPackages.mdwn
diff --git a/Distrib/DebianStatus.mdwn b/hurd/running/debian/DebianStatus.mdwn
index 71b34ae4..71b34ae4 100644
--- a/Distrib/DebianStatus.mdwn
+++ b/hurd/running/debian/DebianStatus.mdwn
diff --git a/Distrib/DebianTranslatorPolicy.mdwn b/hurd/running/debian/DebianTranslatorPolicy.mdwn
index 7092a761..7092a761 100644
--- a/Distrib/DebianTranslatorPolicy.mdwn
+++ b/hurd/running/debian/DebianTranslatorPolicy.mdwn
diff --git a/Distrib/GNUDebianBuildProcess.mdwn b/hurd/running/debian/GNUDebianBuildProcess.mdwn
index 55a9c6aa..55a9c6aa 100644
--- a/Distrib/GNUDebianBuildProcess.mdwn
+++ b/hurd/running/debian/GNUDebianBuildProcess.mdwn
diff --git a/Distrib/GNUDebianPackages.mdwn b/hurd/running/debian/GNUDebianPackages.mdwn
index de1798ad..de1798ad 100644
--- a/Distrib/GNUDebianPackages.mdwn
+++ b/hurd/running/debian/GNUDebianPackages.mdwn
diff --git a/Distrib/GnuDebianRelationship.mdwn b/hurd/running/debian/GnuDebianRelationship.mdwn
index ede808c8..ede808c8 100644
--- a/Distrib/GnuDebianRelationship.mdwn
+++ b/hurd/running/debian/GnuDebianRelationship.mdwn
diff --git a/Distrib/MediaPressKitDiscuss.mdwn b/hurd/running/debian/MediaPressKitDiscuss.mdwn
index e8b1cfff..e8b1cfff 100644
--- a/Distrib/MediaPressKitDiscuss.mdwn
+++ b/hurd/running/debian/MediaPressKitDiscuss.mdwn
diff --git a/Distrib/PackageTroubleshooting.mdwn b/hurd/running/debian/PackageTroubleshooting.mdwn
index fe8b6df4..fe8b6df4 100644
--- a/Distrib/PackageTroubleshooting.mdwn
+++ b/hurd/running/debian/PackageTroubleshooting.mdwn
diff --git a/Distrib/SampleDscFile.mdwn b/hurd/running/debian/SampleDscFile.mdwn
index d3b7b9f8..d3b7b9f8 100644
--- a/Distrib/SampleDscFile.mdwn
+++ b/hurd/running/debian/SampleDscFile.mdwn
diff --git a/Distrib/SoftwareLicensing.mdwn b/hurd/running/debian/SoftwareLicensing.mdwn
index e236fea1..e236fea1 100644
--- a/Distrib/SoftwareLicensing.mdwn
+++ b/hurd/running/debian/SoftwareLicensing.mdwn
diff --git a/Distrib/WebPreferences/logo.png b/hurd/running/debian/logo.png
index 068d9584..068d9584 100644
--- a/Distrib/WebPreferences/logo.png
+++ b/hurd/running/debian/logo.png
diff --git a/Distrib.mdwn b/hurd/running/distrib.mdwn
index dbdb97a7..f3078a65 100644
--- a/Distrib.mdwn
+++ b/hurd/running/distrib.mdwn
@@ -1,27 +1,7 @@
-# Distributions
-
-## <a name="Debian_nbsp_http_www_debian_org_"> </a> Debian <a href="http://www.debian.org/ports/hurd/" target="_top">GNU/Hurd port</a>
-
-Official page about the Debian distribution of the GNU/Hurd system. Some additional notes are at [[DebianStatus]]
-
-- <a href="http://people.debian.org/~mbanck/talks/hurd_lt2004/html/" target="_top">Presentation "Debian GNU/Hurd" by Michael Banck, <nop>LinuxTag 2004 Karlsruhe</nop></a>
-- <a href="http://www.numenor.art.pl/balrog/hurd/" target="_top">A disk image with an installation of the Debian distribution of GNU/Hurd</a>
-- [[DebianFAQ]]
-- [[DebianAfterInstall]] -- Do this to get networking, new console and X
-
-<a href="http://www.gnuab.org/qui-som" target="_top">GNUAB</a> has some images and packages available at <a href="http://ftp.gnuab.org" target="_top">http://ftp.gnuab.org</a> for the unreleased (not unstable) Debian distro
-
-## <a href="http://hurd.rustedhalo.net/" target="_top">Gentoo-Hurd</a></dt>
-
-Unofficial port to Gentoo &amp;amp; the portage system. It was <a href="http://forums.gentoo.org/viewtopic.php?t=41939&amp;postdays=0&amp;postorder=asc&amp;start=0" target="_top">announced</a> March 17, 2003 in the Gentoo forums. There's a #gentoo-irc channel similar to [[IRC]]. At present (May 2005), there's no activity and Eric Olinger has not the time to maintain this distri.
-
-## <a href="http://bee.es.gnu.org/" target="_top">Bee GNU/Hurd</a></dt>
-
-Castellano distribution, pkgsrc package based. [[BochsEmulator]] image available too. They have their own <a href="http://es.gnu.org/cgi-bin/beewiki.pl?Wiki_Bee_GNU" target="_top">wiki</a> and a <a href="http://bee.es.gnu.org/?p=mail&amp;l=en" target="_top">mail list</a> (no archive).
-
-## [[GnuOS]]
-
-Distribution is in discussion &amp;amp; pre-planning phase
+* [[Debian]]
+* [[Gentoo]]
+* [[Bee]]
+* [[GNU]]
 
 
 # Issues
diff --git a/hurd/running/gentoo.mdwn b/hurd/running/gentoo.mdwn
new file mode 100644
index 00000000..b49e5bcc
--- /dev/null
+++ b/hurd/running/gentoo.mdwn
@@ -0,0 +1,8 @@
+[Gentoo-Hurd](http://hurd.rustedhalo.net/)
+
+Unofficial port to Gentoo and the portage system. It was
+[announced](http://forums.gentoo.org/viewtopic.php?t=41939&amp;postdays=0&amp;postorder=asc&amp;start=0)
+March 17, 2003 in the Gentoo forums.  There's a #gentoo-irc channel similar to
+[[IRC]].  At present (May 2005), there's no activity and Eric Olinger has not
+the time to maintain this distri.
+
diff --git a/Distrib/GnuOS.mdwn b/hurd/running/gnu.mdwn
index 4206527c..6b94ed25 100644
--- a/Distrib/GnuOS.mdwn
+++ b/hurd/running/gnu.mdwn
@@ -1,5 +1,9 @@
+[[img logo.png]]
+
 # <a name="The_GNU_Operating_System"> </a> The GNU Operating System
 
+[[gnu/GNU]].
+
 It is our wish and goal to establish a new direction for the GNU system distribution. To that end, this page will begin setting some direction. This was spawned by several discussions over a few days on the Hurd mailing lists and IRC.
 
 This is not intended to detract from Debian GNU/Hurd and we should help them where we can.
diff --git a/GNU/discussion.mdwn b/hurd/running/gnu/discussion.mdwn
index 7a96803b..7a96803b 100644
--- a/GNU/discussion.mdwn
+++ b/hurd/running/gnu/discussion.mdwn
diff --git a/GNU.mdwn b/hurd/running/gnu/gnu.mdwn
index bb780271..22bb5161 100644
--- a/GNU.mdwn
+++ b/hurd/running/gnu/gnu.mdwn
@@ -1,3 +1,5 @@
+[[img logo.png]]
+
 ## <a name="GNU_FSF_amp_RMS"> </a> GNU, FSF &amp; RMS
 
 GNU stands for GNU's Not Unix. It is a project announced in 1983 by [[RichardStallman]] (RMS). The Free Software Foundation ([FSF](http://www.fsf.org/fsf/fsf.html)) was founded in 1985 to act as a parent organization for GNU and many other projects. GNU and some non-GNU projects are now hosted on the [Savannah](http://savannah.gnu.org) platform similar to SourceForge.net.
@@ -5,9 +7,9 @@ GNU stands for GNU's Not Unix. It is a project announced in 1983 by [[RichardSta
 <dl>
 <dt>[[History]]</dt>
 <dd> Background information about the GNU Project. </dd>
-<dt>[[GnuNames]]</dt>
+<dt>[[Names]]</dt>
 <dd> A page describing the name GNU itself and it's usage. </dd>
-<dt>[[TheGnuManifesto]]</dt>
+<dt>[[Manifesto]]</dt>
 <dd> A founding document that still influences the system's technical design and moral philosophy. </dd>
 <dt> FAQ Link</dt>
 <dd> What is the relation between <a href="http://www.gnu.org/software/hurd/faq.en.html#q1-2" target="_top">GNU and Hurd</a>? </dd>
@@ -18,3 +20,5 @@ GNU stands for GNU's Not Unix. It is a project announced in 1983 by [[RichardSta
 <dt><a href="http://lists.gnu.org/mailman/listinfo/gnu-system-discuss" target="_top">gnu-system-discuss</a></dt>
 <dd> Mailing list for discussion about the GNU system. </dd>
 </dl>
+
+[[TODO]].
diff --git a/GNU/History.mdwn b/hurd/running/gnu/history.mdwn
index f321c961..f321c961 100644
--- a/GNU/History.mdwn
+++ b/hurd/running/gnu/history.mdwn
diff --git a/GNU/WebPreferences/logo.png b/hurd/running/gnu/logo.png
index 50c392cf..50c392cf 100644
--- a/GNU/WebPreferences/logo.png
+++ b/hurd/running/gnu/logo.png
diff --git a/GNU/TheGnuManifesto.mdwn b/hurd/running/gnu/manifesto.mdwn
index c2a3294f..c2a3294f 100644
--- a/GNU/TheGnuManifesto.mdwn
+++ b/hurd/running/gnu/manifesto.mdwn
diff --git a/GNU/GnuNames.mdwn b/hurd/running/gnu/names.mdwn
index d470a632..d470a632 100644
--- a/GNU/GnuNames.mdwn
+++ b/hurd/running/gnu/names.mdwn
diff --git a/GNU/RichardStallman.mdwn b/hurd/running/gnu/richardstallman.mdwn
index d6688850..d6688850 100644
--- a/GNU/RichardStallman.mdwn
+++ b/hurd/running/gnu/richardstallman.mdwn
diff --git a/GNU/SoftwareProjects.mdwn b/hurd/running/gnu/softwareprojects.mdwn
index 54a92030..54a92030 100644
--- a/GNU/SoftwareProjects.mdwn
+++ b/hurd/running/gnu/softwareprojects.mdwn
diff --git a/GNU/ToDo.mdwn b/hurd/running/gnu/todo.mdwn
index e2dc2e89..e2dc2e89 100644
--- a/GNU/ToDo.mdwn
+++ b/hurd/running/gnu/todo.mdwn
diff --git a/microkernel/mach.mdwn b/microkernel/mach.mdwn
index 761b9b3d..078b531f 100644
--- a/microkernel/mach.mdwn
+++ b/microkernel/mach.mdwn
@@ -1,3 +1,5 @@
+[[img logo.png]]
+
 Mach is a so-called first generation [[microkernel]].  It is the
 microkernel currently used by the [[Hurd]].
 
diff --git a/microkernel/mach/logo.png b/microkernel/mach/logo.png
new file mode 100644
index 00000000..94951acf
--- /dev/null
+++ b/microkernel/mach/logo.png
diff --git a/microkernel/mach/mig.mdwn b/microkernel/mach/mig.mdwn
index b15b8f50..f47eadfb 100644
--- a/microkernel/mach/mig.mdwn
+++ b/microkernel/mach/mig.mdwn
@@ -1,3 +1,5 @@
+[[img logo.png]]
+
 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
diff --git a/microkernel/mach/mig/WebPreferences/logo.png b/microkernel/mach/mig/logo.png
index cdfec179..cdfec179 100644
--- a/microkernel/mach/mig/WebPreferences/logo.png
+++ b/microkernel/mach/mig/logo.png
diff --git a/sidebar.mdwn b/sidebar.mdwn
index c2a6a17e..4840ac70 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -26,16 +26,9 @@ redistribute your contributions.
   * *[[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]]*"]]
-
----
-
-* **[[Distrib]]**[[if test="destpage(Distrib*)" then="
-  * *[[Installation|Distrib/InstallNotes]]*"]]
-* **[[GNU]]**[[if test="destpage(GNU*)" then="
-  * *[GNU Homepage](http://www.gnu.org/)*
-  * *[Savannah](http://savannah.gnu.org/)*
-  * *[[GNU/ToDo]]*"]]
diff --git a/Distrib/BochsEmulator.mdwn b/unsorted/BochsEmulator.mdwn
index 8c9f5cfe..8c9f5cfe 100644
--- a/Distrib/BochsEmulator.mdwn
+++ b/unsorted/BochsEmulator.mdwn
diff --git a/Distrib/BochsFAQ.mdwn b/unsorted/BochsFAQ.mdwn
index d446f695..d446f695 100644
--- a/Distrib/BochsFAQ.mdwn
+++ b/unsorted/BochsFAQ.mdwn
diff --git a/Distrib/BuildingTheHurd.mdwn b/unsorted/BuildingTheHurd.mdwn
index fb412eae..fb412eae 100644
--- a/Distrib/BuildingTheHurd.mdwn
+++ b/unsorted/BuildingTheHurd.mdwn
diff --git a/Distrib/GrubNotes.mdwn b/unsorted/GrubNotes.mdwn
index b0b1fdf5..b0b1fdf5 100644
--- a/Distrib/GrubNotes.mdwn
+++ b/unsorted/GrubNotes.mdwn
diff --git a/Distrib/HurdWnpp.mdwn b/unsorted/HurdWnpp.mdwn
index 49e069de..49e069de 100644
--- a/Distrib/HurdWnpp.mdwn
+++ b/unsorted/HurdWnpp.mdwn
diff --git a/Distrib/InstallNotes.mdwn b/unsorted/InstallNotes.mdwn
index 418caca1..418caca1 100644
--- a/Distrib/InstallNotes.mdwn
+++ b/unsorted/InstallNotes.mdwn
diff --git a/Distrib/InstallTips.mdwn b/unsorted/InstallTips.mdwn
index a735fbf7..a735fbf7 100644
--- a/Distrib/InstallTips.mdwn
+++ b/unsorted/InstallTips.mdwn
diff --git a/Distrib/PortingIssues.mdwn b/unsorted/PortingIssues.mdwn
index 747fb230..747fb230 100644
--- a/Distrib/PortingIssues.mdwn
+++ b/unsorted/PortingIssues.mdwn
diff --git a/Distrib/QEMU.mdwn b/unsorted/QEMU.mdwn
index 27086257..27086257 100644
--- a/Distrib/QEMU.mdwn
+++ b/unsorted/QEMU.mdwn
diff --git a/Distrib/SavannahProjects.mdwn b/unsorted/SavannahProjects.mdwn
index 3024ed64..3024ed64 100644
--- a/Distrib/SavannahProjects.mdwn
+++ b/unsorted/SavannahProjects.mdwn
diff --git a/Distrib/SystemAPILimits.mdwn b/unsorted/SystemAPILimits.mdwn
index 8930ef9c..8930ef9c 100644
--- a/Distrib/SystemAPILimits.mdwn
+++ b/unsorted/SystemAPILimits.mdwn
diff --git a/Distrib/TestSuites.mdwn b/unsorted/TestSuites.mdwn
index e268ba8d..e268ba8d 100644
--- a/Distrib/TestSuites.mdwn
+++ b/unsorted/TestSuites.mdwn
diff --git a/Distrib/VmWare.mdwn b/unsorted/VmWare.mdwn
index 6f4c3cba..6f4c3cba 100644
--- a/Distrib/VmWare.mdwn
+++ b/unsorted/VmWare.mdwn