24 files changed, 65 insertions, 75 deletions
diff --git a/bddebian.mdwn b/bddebian.mdwn
deleted file mode 100644
index 8650bdf7..00000000
--- a/bddebian.mdwn
+++ /dev/null
@@ -1,24 +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]]."]]"""]]
-
-HERE STARTS YOUR NEW CONTENT -- remove everything from here on, including this
-line.
-
-By creating this page, you agree to assign copyright for your contribution to
-the Free Software Foundation, <http://www.fsf.org/>.  The Free Software
-Foundation promises to always use a free documentation license (as per our
-criteria of free documentation) when publishing your contribution.  We grant
-you back all your rights under copyright, including the rights to copy, modify,
-and redistribute your contributions.
-
-We're requiring these copyright assignments, so that we'll easily be able to
-include your contributions in official GNU documentation, such as the GNU Hurd
-Reference Manual, etc.  Send email to <hurd-maintainers@gnu.org> if there are
-questions.
diff --git a/contributing.mdwn b/contributing.mdwn
index 9e2396cf..a5b3a34e 100644
--- a/contributing.mdwn
+++ b/contributing.mdwn
@@ -41,7 +41,7 @@ For one there's the implementation of the *[[Hurd]] running on the
 meant when people are talking about GNU/Hurd systems.
 
 This system has mostly been designed and implemented
-[[in_the_'90s|hurd/history]].  It works and is usable.
+[[in the '90s|history]].  It works and is usable.
 For example, these web pages are rendered on a [GNU/Hurd
 system](http://www.bddebian.com/cgi-bin/uptime).
 
diff --git a/hurd/history.mdwn b/history.mdwn
index 18a1506f..927482d9 100644
--- a/hurd/history.mdwn
+++ b/history.mdwn
@@ -48,7 +48,8 @@ full functionality.  Later we hope to have a modular emulator divided
 into multiple processes.  [Gnusletter, Jan. 1991].
 </BLOCKQUOTE>
 
-RMS explains the relationship between the [[documentation/Hurd_and_Linux]], where he mentions
+RMS explains the relationship between [[the Hurd and
+Linux|hurd/documentation/hurd-and-linux]], where he mentions
 that the FSF started developing the Hurd in 1990.  As of [Gnusletter,
 Nov. 1991], the Hurd (running on Mach) is GNU's official kernel.
 
diff --git a/hurd/history/hurd-announce b/history/hurd-announce
index 2f165ad8..2f165ad8 100644
--- a/hurd/history/hurd-announce
+++ b/history/hurd-announce
diff --git a/hurd/history/hurd-announce2 b/history/hurd-announce2
index dce41c43..dce41c43 100644
--- a/hurd/history/hurd-announce2
+++ b/history/hurd-announce2
diff --git a/hurd/history/hurd-flash b/history/hurd-flash
index d1bacc79..d1bacc79 100644
--- a/hurd/history/hurd-flash
+++ b/history/hurd-flash
diff --git a/hurd/history/hurd-flash10 b/history/hurd-flash10
index d6d5685b..d6d5685b 100644
--- a/hurd/history/hurd-flash10
+++ b/history/hurd-flash10
diff --git a/hurd/history/hurd-flash11 b/history/hurd-flash11
index 57851b01..57851b01 100644
--- a/hurd/history/hurd-flash11
+++ b/history/hurd-flash11
diff --git a/hurd/history/hurd-flash12 b/history/hurd-flash12
index 5be9c94e..5be9c94e 100644
--- a/hurd/history/hurd-flash12
+++ b/history/hurd-flash12
diff --git a/hurd/history/hurd-flash13 b/history/hurd-flash13
index a2de6bfd..a2de6bfd 100644
--- a/hurd/history/hurd-flash13
+++ b/history/hurd-flash13
diff --git a/hurd/history/hurd-flash14 b/history/hurd-flash14
index 2d67687a..2d67687a 100644
--- a/hurd/history/hurd-flash14
+++ b/history/hurd-flash14
diff --git a/hurd/history/hurd-flash15 b/history/hurd-flash15
index 0785ac59..0785ac59 100644
--- a/hurd/history/hurd-flash15
+++ b/history/hurd-flash15
diff --git a/hurd/history/hurd-flash2 b/history/hurd-flash2
index b1d4f66f..b1d4f66f 100644
--- a/hurd/history/hurd-flash2
+++ b/history/hurd-flash2
diff --git a/hurd/history/hurd-flash3 b/history/hurd-flash3
index 19a5f371..19a5f371 100644
--- a/hurd/history/hurd-flash3
+++ b/history/hurd-flash3
diff --git a/hurd/history/hurd-flash4 b/history/hurd-flash4
index 89ae9848..89ae9848 100644
--- a/hurd/history/hurd-flash4
+++ b/history/hurd-flash4
diff --git a/hurd/history/hurd-flash5 b/history/hurd-flash5
index 041a0ef7..041a0ef7 100644
--- a/hurd/history/hurd-flash5
+++ b/history/hurd-flash5
diff --git a/hurd/history/hurd-flash6 b/history/hurd-flash6
index e774714e..e774714e 100644
--- a/hurd/history/hurd-flash6
+++ b/history/hurd-flash6
diff --git a/hurd/history/hurd-flash7 b/history/hurd-flash7
index ce6e08d2..ce6e08d2 100644
--- a/hurd/history/hurd-flash7
+++ b/history/hurd-flash7
diff --git a/hurd/history/hurd-flash8 b/history/hurd-flash8
index 555186ec..555186ec 100644
--- a/hurd/history/hurd-flash8
+++ b/history/hurd-flash8
diff --git a/hurd/history/hurd-flash9 b/history/hurd-flash9
index 1ff32ba9..1ff32ba9 100644
--- a/hurd/history/hurd-flash9
+++ b/history/hurd-flash9
diff --git a/hurd/history/port_to_l4.mdwn b/history/port_to_l4.mdwn
index ec72def4..cdf048e6 100644
--- a/hurd/history/port_to_l4.mdwn
+++ b/history/port_to_l4.mdwn
@@ -21,20 +21,20 @@ in November 2000.
 
 The project itself then was mostly lead by Marcus Brinkmann and Neal Walfield.
 Even though there was progress -- see, for example, the
-[[QEMU_image_for_L4|running/qemu/image_for_l4]] -- this port never reached a
+[[QEMU image for L4|hurd/running/qemu/image for l4]] -- this port never reached a
 releasable state.  Eventually, a straight-forward port of the original Hurd's
 design wasn't deemed feasible anymore by the developers, partly due to them not
 cosidering L4 suitable for implementing a general-purpose operating system on
 top of it, and because of deficiencies in the original Hurd's design, which
-they discovered along their way.  Read the [[critique]] and a
-[[ng/position_paper]].
+they discovered along their way.  Read the [[hurd/critique]] and a
+[[hurd/ng/position paper]].
 
 By now, the development of Hurd/L4 has stopped.  However, Neal Walfield moved
 on to working on a newly designed kernel called [[microkernel/viengoos]].
 
 Over the years, a lot of discussion have been held on the
 [[mailing lists/l4-hurd]] mailing list, which today is still the right place
-for [[next-generation_Hurd|ng]] discussions.
+for [[next-generation Hurd|hurd/ng]] discussions.
 
 Development of Hurd/L4 was done in the `hurd-l4` module of the Hurd CVS
 repository.  The `doc` directory contains a design document that is worth
@@ -83,10 +83,10 @@ explains:
 > rejected some parts of the Hurd's design.  The
 > [[open issues/resource management problems]] were
 > what prompted me to look at L4.  Also, some of the problems with
-> [[translator]]s were already well-known to us.  (For a more detailed
-> description of the problems we have identified, see our [[critique]] in the
+> [[hurd/translator]]s were already well-known to us.  (For a more detailed
+> description of the problems we have identified, see our [[hurd/critique]] in the
 > 2007 July's SIGOPS OSR.  We have also written a forward-looking
-> [[ng/position_paper]].)
+> [[hurd/ng/position paper]].)
 
 > We visited Jonathan Shapiro at Hopkins in January 2006.  This resulted in a
 > number of discussions, some quite influential, and not always in a way which
diff --git a/hurd-l4.mdwn b/hurd-l4.mdwn
index c261b6c1..5ad3c3d4 100644
--- a/hurd-l4.mdwn
+++ b/hurd-l4.mdwn
@@ -8,4 +8,4 @@ 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 redir=hurd/history/port_to_l4]]
+[[!meta redir=history/port_to_l4]]
diff --git a/index.mdwn b/index.mdwn
index b1b00640..6129d4ef 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -20,7 +20,7 @@ kernels (such as Linux).
 <em>[[More_detailed|hurd/what_is_the_gnu_hurd]].</em></p>
 </div>
 <div id="mission">
-<p class="statement-title">What is the mission of the Hurd project?</p>
+<p class="statement-title">What is the mission of the GNU Hurd project?</p>
 <p>Our mission is to create a general-purpose kernel suitable 
 for the GNU operating system, which is viable for everyday use, 
 and gives users and programs as much control over their 
diff --git a/user/scolobb.mdwn b/user/scolobb.mdwn
index e7c1adf0..2182f12e 100644
--- a/user/scolobb.mdwn
+++ b/user/scolobb.mdwn
@@ -29,32 +29,34 @@ For documentation, see [[hurd/translator/unionmount]].
 
 ### DONE
 
-* **Make `unionfs` build.** For reasons unknown to me, `unionfs`
-  Makefile was configured to search for include files from under
-  `$(prefix)/include`, while `$(prefix)` was never defined. Setting
-  `$(prefix)` to `/usr` solved the problem.
+(Dates in brackets show the completion date)
+
+* **Make `unionfs` build.** *(24 May)* For reasons unknown to me,
+  `unionfs` Makefile was configured to search for include files from
+  under `$(prefix)/include`, while `$(prefix)` was never
+  defined. Setting `$(prefix)` to `/usr` solved the problem.
 
 * **Change the command line parsing in `unionfs` to comply with the
-  requirements of `unionmount`.** Although the core functionality of
-  `unionmount` heavily relies on `unionfs`, the command line interface
-  of these two programs is completely different: `unionfs` operates on
-  directories, the list of which is explicitly specified, while
-  `unionmount` *always* merges the underlying filesystem and the
-  filesystem published by the mountee. Therefore, options like
-  `--add`, `--remove`, `--underlying` (specific to `unionfs`) make
-  little sense in `unionmount` context. These options have been
-  removed. Also, `unionmount` must be able to pass some switches to
-  the mountee, which means that it should stop parsing the command
-  line arguments immediately after having encountered the path to the
-  mountee (very similar to how `settrans` works). This functionality
-  has also been implemented.
-
-* **Make `unionmount` capable of starting the mountee.** The idea
-  behind implementation of this goal is that `unionmount` should
-  provide a proxy node on which to set the mountee. The main issue
-  about this goal was the fact that the mountee *cannot* be started
-  during the initialization of `unionmount`, because in this phase
-  `unionmount` is not capable of responding to RPCs, while many
+  requirements of `unionmount`.** *(25 May)* Although the core
+  functionality of `unionmount` heavily relies on `unionfs`, the
+  command line interface of these two programs is completely
+  different: `unionfs` operates on directories, the list of which is
+  explicitly specified, while `unionmount` *always* merges the
+  underlying filesystem and the filesystem published by the
+  mountee. Therefore, options like `--add`, `--remove`, `--underlying`
+  (specific to `unionfs`) make little sense in `unionmount`
+  context. These options have been removed. Also, `unionmount` must be
+  able to pass some switches to the mountee, which means that it
+  should stop parsing the command line arguments immediately after
+  having encountered the path to the mountee (very similar to how
+  `settrans` works). This functionality has also been implemented.
+
+* **Make `unionmount` capable of starting the mountee.** *(28 May)*
+  The idea behind implementation of this goal is that `unionmount`
+  should provide a proxy node on which to set the mountee. The main
+  issue about this goal was the fact that the mountee *cannot* be
+  started during the initialization of `unionmount`, because in this
+  phase `unionmount` is not capable of responding to RPCs, while many
   translators try to `io_stat` their underlying node or do other
   interesting things on startup. The solution to this problem is,
   obviously, *lazy* startup, i.e. the mountee is started at the first
@@ -62,26 +64,37 @@ For documentation, see [[hurd/translator/unionmount]].
   filesystem published by `unionmount`.
 
 * **Include the filesystem published by the mountee in the list of
-  merged filesystems.** `unionfs` operates on a list of ports to the
-  underlying filesystems, therefore, to finish the unionmount
-  functionality, I had to include the port to the mountee in this
-  list.
-
-* **Learn Texinfo.** In order to produce canonical documentation I had
-  to learn the Texinfo documentation format.
-
-* **Write documentation for `unionmount`.** The basic unionmount
-  functionality being finished, it has to be documented properly, lest
-  it should lag behind and remain unfinished eventually.
-
-* **Write documentation for `unionfs`.** `unionfs` is not exactly
-  well-documented at the moment, the only help being provided by the
-  comments in the sources. The goal is to write a more coherent
+  merged filesystems.** *(1 Jun)* `unionfs` operates on a list of
+  ports to the underlying filesystems, therefore, to finish the
+  unionmount functionality, I had to include the port to the mountee
+  in this list.
+
+* **Learn Texinfo.** *(Jun 4)* In order to produce canonical
+  documentation I had to learn the Texinfo documentation format.
+
+* **Write documentation for `unionmount`.** *(Jun 5)* The basic
+  unionmount functionality being finished, it has to be documented
+  properly, lest it should lag behind and remain unfinished
+  eventually.
+
+* **Write documentation for `unionfs`.** *(Jun 5)* `unionfs` is not
+  exactly well-documented at the moment, the only help being provided
+  by the comments in the sources. The goal is to write a more coherent
   documentation.
 
 ### TODO
 
-(Dates in brackets show the approximate deadline)
+(Dates in brackets show the *expected* completion date)
+
+* **Study eth-multiplexer.** *(12 Jun)* In order to get an idea of
+  what should the rules for eth-multipexer be, I will have to study
+  the current state of eth-multiplexer.
+
+* **Start with a clean unionfs and implement the `--mount` argument**
+  *(12 Jun)* It was suggested to implement the union mount
+  functionality first, instead of doing some partial adaptation of
+  `unionfs` to `unionmount` and leaving the complete adaptation for
+  the future.
 
 * **Implement merging rules.** *(25 Jul)* Some details are still
   awaiting discovery by me.