4 files changed, 25 insertions, 51 deletions
diff --git a/hurd/running/debian/dhcp.mdwn b/hurd/running/debian/dhcp.mdwn
index 8d351aae..afa46799 100644
--- a/hurd/running/debian/dhcp.mdwn
+++ b/hurd/running/debian/dhcp.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2011 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2011, 2012 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
@@ -10,16 +10,16 @@ License|/fdl]]."]]"""]]
 
 [[!tag open_issue_porting]]
 
-In order to use DHCP, you need to install the `ifup` and `isc-dhcp-client`
-packages, and manually create the following two symbolic links:
+In order to use DHCP, you need to install the `ifupdown` and `isc-dhcp-client`
+packages, and manually create the following symbolic link:
 
-    # ln -s ../rcS.d/S06ifupdown-clean ../rcS.d/S11networking /etc/rc.boot/
+    # ln -s ../rcS.d/S10networking /etc/rc.boot/
 
-During execution at boot time, the `S11networking` script will emit some error
+During execution at boot time, the `S10networking` script will emit some error
 messages while trying to configure the loopback interface.  These are not
 fatal.
 
-Debian GNU/Hurd doesn't currently execute's Debian standard `/etc/rcS.d/*` boot
+Debian GNU/Hurd doesn't currently execute Debian standard `/etc/rcS.d/*` boot
 scripts, but has its own `/libexec/rc` script -- which integrates scripts from
 `/etc/rc.boot/` instead.
 
diff --git a/hurd/translator/procfs.mdwn b/hurd/translator/procfs.mdwn
index 70448e94..cccce0b7 100644
--- a/hurd/translator/procfs.mdwn
+++ b/hurd/translator/procfs.mdwn
@@ -1,13 +1,13 @@
-[[!meta copyright="Copyright © 2008, 2009, 2010 Free Software Foundation,
-Inc."]]
+[[!meta copyright="Copyright © 2008, 2009, 2010, 2011, 2012 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]]."]]"""]]
+is included in the section entitled [[GNU Free Documentation
+License|/fdl]]."]]"""]]
 
 Although there is no standard (POSIX or other) for the layout of the `/proc`
 pseudo-filesystem, it turned out a very useful facility in GNU/Linux and other
@@ -23,13 +23,23 @@ management tools to work.  (On Linux, the `/proc` filesystem is used also for
 debugging purposes; but this is highly system-specific anyways, so there is
 probably no point in trying to duplicate this functionality as well...)
 
-*Status*: Madhusudan.C.S has implemented a new, fully functional [[procfs|madhusudancs]] for
-[[GSoC 2008|community/gsoc/2008]].
+Ther was an implementation in [[open_issues/HurdExtras]],
+<http://www.nongnu.org/hurdextras/#procfs>.
 
+Madhusudan.C.S has implemented a new, fully functional [[procfs|madhusudancs]] for
+[[GSoC 2008|community/gsoc/2008]].
 
-# [[New Implementation by Jérémie Koenig|jkoenig]]
+In August 2010, Jérémie Koenig [published another, new
+version](http://lists.gnu.org/archive/html/bug-hurd/2010-08/msg00165.html).
+This can be found in <http://git.savannah.gnu.org/cgit/hurd/procfs.git/>.
 
+Testing it is as simple as this:
 
-# Old Implementation from [[open_issues/HurdExtras]]
+    $ git clone git://git.savannah.gnu.org/hurd/procfs.git
+    $ cd procfs/
+    $ git checkout master
+    $ make
+    $ settrans -ca proc procfs --compatible
+    $ ls -l proc/
 
-<http://www.nongnu.org/hurdextras/#procfs>
+[[Open issues|jkoenig/discussion]].
diff --git a/hurd/translator/procfs/jkoenig.mdwn b/hurd/translator/procfs/jkoenig.mdwn
deleted file mode 100644
index 9543b658..00000000
--- a/hurd/translator/procfs/jkoenig.mdwn
+++ /dev/null
@@ -1,23 +0,0 @@
-[[!meta copyright="Copyright © 2010, 2011 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]]."]]"""]]
-
-In August 2010, Jérémie Koenig [published another, new
-version](http://lists.gnu.org/archive/html/bug-hurd/2010-08/msg00165.html).
-This can be found in <http://git.savannah.gnu.org/cgit/hurd/procfs.git/>,
-branch *jkoenig/master*.
-
-Testing it is as simple as this:
-
-    $ git clone git://git.savannah.gnu.org/hurd/procfs.git
-    $ cd procfs/
-    $ git checkout jkoenig/master
-    $ make
-    $ settrans -ca proc procfs --compatible
-    $ ls -l proc/
diff --git a/hurd/translator/procfs/jkoenig/discussion.mdwn b/hurd/translator/procfs/jkoenig/discussion.mdwn
index da6f081e..8ee34949 100644
--- a/hurd/translator/procfs/jkoenig/discussion.mdwn
+++ b/hurd/translator/procfs/jkoenig/discussion.mdwn
@@ -18,9 +18,6 @@ License|/fdl]]."]]"""]]
 
 IRC, #hurd, around September 2010
 
-    <youpi> jkoenig: from a quick read, your procfs implementation seems quite
-      simple, probably much more what I was expecting from Madhusudan (who
-      probably now hates you :) )
     <youpi> jkoenig: is it not possible to provide a /proc/self which points at
       the client's pid?
     <pinotree> (also, shouldn't /proc/version say something else than "Linux"?)
@@ -313,16 +310,6 @@ Needed by glibc's `pldd` tool (commit
     <jkoenig> pinotree, it's probably what happened, yes.
 
 
-# IRC, freenode, #hurd, 2012-06-30
-
-    <pinotree> btw, what do you think about making jkoening's procfs master the
-      real master?
-    <youpi> probably a good idea
-    <youpi> it does work quite well, except a few pidof hangs
-    <pinotree> surely better than the old one :)
-    <youpi> yes :)
-
-
 # `/proc/[PID]/cwd`
 
 ## IRC, freenode, #hurd, 2012-06-30