10 files changed, 45 insertions, 29 deletions
diff --git a/hurd/libstore/part.mdwn b/hurd/libstore/part.mdwn
index 5d727ad8..5260d05d 100644
--- a/hurd/libstore/part.mdwn
+++ b/hurd/libstore/part.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2010 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2010, 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
@@ -21,6 +21,13 @@ Neal:
 
 > The motivation was to be able to evict the partitioning logic from Mach.
 
----
 
-TODO: How to use, etc.
+# Booting
+
+A similar problem is described in
+[[community/gsoc/project_ideas/unionfs_boot]], and needs to be implemented.
+
+
+# TODO
+
+How to use, etc.
diff --git a/hurd/porting/guidelines.mdwn b/hurd/porting/guidelines.mdwn
index e47d4408..2618cd90 100644
--- a/hurd/porting/guidelines.mdwn
+++ b/hurd/porting/guidelines.mdwn
@@ -254,7 +254,7 @@ then be found.
 
 ## <a name="SA_SIGINFO"> `SA_SIGINFO` </a>
 
-Implemented by Jeremie Koenig, pending upload in Debian eglibc 2.13-19.
+Implemented by Jérémie Koenig, pending upload in Debian eglibc 2.13-19.
 
 ## <a name="SA_NOCLDWAIT"> `SA_NOCLDWAIT` </a>
 
diff --git a/hurd/running/debian/qemu_image.mdwn b/hurd/running/debian/qemu_image.mdwn
index 9f828556..809bf7b1 100644
--- a/hurd/running/debian/qemu_image.mdwn
+++ b/hurd/running/debian/qemu_image.mdwn
@@ -15,7 +15,7 @@ Usage:
 
     $ wget http://people.debian.org/~sthibault/hurd-i386/debian-hurd.img.tar.gz
     $ tar -xz < debian-hurd.img.tar.gz
-    $ qemu -net nic,model=rtl8139 -net user debian-hurd-*.img
+    $ qemu -net nic,model=rtl8139 -net user -hda debian-hurd-*.img
 
 Just in case you were wondering: the *root* password is *root*.
 
diff --git a/hurd/running/distrib.mdwn b/hurd/running/distrib.mdwn
index 90211e34..befb015d 100644
--- a/hurd/running/distrib.mdwn
+++ b/hurd/running/distrib.mdwn
@@ -5,6 +5,7 @@ Working distributions of GNU/Hurd:
 GNU/Hurd distributions in early stages of development: 
 
 * [[Arch|arch_hurd]] (features a LiveCD)
+* [[Nix]]
 * [[Gentoo]]
 * [[GNU]]
 
diff --git a/hurd/running/nixos.mdwn b/hurd/running/nix.mdwn
index 2fa44ede..663589f6 100644
--- a/hurd/running/nixos.mdwn
+++ b/hurd/running/nix.mdwn
@@ -8,7 +8,7 @@ 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 title="NixOS"]]
+[[!meta title="Nix-based GNU/Hurd System"]]
 
 <http://www.nixos.org/>
 
@@ -17,3 +17,11 @@ License|/fdl]]."]]"""]]
       * <http://hydra.nixos.org/job/gnu/hurd-master/qemu_image/latest/download>
 
   * <http://hydra.nixos.org/job/gnu/hurd-master/qemu_test>
+
+---
+
+This QEMU image is not (yet) comparable to NixOS, because the latter provides
+extra features, such as whole-system configuration (including services, etc.),
+and whole-system transactional update and rollback.  It is is cross-built using
+Nix, and because of that, it uses per-package installation directories under
+`/nix/store`.
diff --git a/hurd/running/qemu.mdwn b/hurd/running/qemu.mdwn
index ee1574b7..fcf58d8a 100644
--- a/hurd/running/qemu.mdwn
+++ b/hurd/running/qemu.mdwn
@@ -20,7 +20,7 @@ You can use the following images to give the GNU/Hurd a try.
 
 [[!inline pages=hurd/running/debian/qemu_image raw=yes feeds=no]]
 
-## [[NixOS]]
+## [[Nix]]
 
 ## Unofficial Images
 
diff --git a/hurd/running/qemu/networking.mdwn b/hurd/running/qemu/networking.mdwn
index 71daa576..2bc9b16d 100644
--- a/hurd/running/qemu/networking.mdwn
+++ b/hurd/running/qemu/networking.mdwn
@@ -20,7 +20,7 @@ Netmask is 255.255.255.0
 
 You can setup the pfinet translator with the command
 
-    $ settrans -fgap /servers/socket/2 /hurd/pfinet -a 10.0.2.15 -g 10.0.2.2 -m 255.255.255.0
+    $ settrans -fgap /servers/socket/2 /hurd/pfinet -i eth0 -a 10.0.2.15 -g 10.0.2.2 -m 255.255.255.0
 
 Configure nameserver in /etc/resolve.conf
 
diff --git a/hurd/status.mdwn b/hurd/status.mdwn
index a48c128f..dd67a4c2 100644
--- a/hurd/status.mdwn
+++ b/hurd/status.mdwn
@@ -1,5 +1,5 @@
-[[!meta copyright="Copyright © 2001, 2002, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2001, 2002, 2007, 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
@@ -14,7 +14,7 @@ License|/fdl]]."]]"""]]
 The Hurd, together with the GNU Mach microkernel, the GNU C Library
 and the other GNU and non-GNU programs in the GNU system, provide a
 rather complete and usable operating system today.  It may not be ready
-for production use, as there are still many bugs and missing features.
+for production use, as there are still some bugs and missing features.
 However, it should be a good base for further development and
 non-critical application usage.
 
@@ -22,14 +22,12 @@ non-critical application usage.
 alt="FVWM and Gnumeric running on GNU/Hurd"
 title="FVWM and Gnumeric running on GNU/Hurd"
 align="right"
-
 ]] The GNU system (also called GNU/Hurd) is completely self-contained
 (you can compile all parts of it using GNU itself).  You can run
 several instances of the Hurd in parallel, and debug even critical
 servers in one Hurd instance with gdb running on another Hurd
-instance.  You can run the X window system, applications that use it,
-and advanced server applications like the Apache webserver.
-
+instance.  You can run the X window system, applications that use it such as
+gnumeric, iceweasel, and advanced server applications like the Apache webserver.
 
 On the negative side, the support for character devices (like sound
 cards) and other hardware is mostly missing.  Although the [[POSIX
@@ -42,24 +40,24 @@ last release (0.2).  We encourage everybody who is interested to try
 out the current development version, and send feedback to the Hurd
 developers.
 
-
 The Hurd team doesn't create Hurd-only releases, but instead relies on
-a distribution done by folks from *Debian* and since 2010 also *Arch*.
+the distributions done by folks from *Debian*, *Arch* (since 2010), and *Nix*
+(since 2012).
 
-That Debian version closely tracks the progress of the Hurd 
-(and often includes many new features), 
-so little would be gained by creating an official pure Hurd release. 
-
-The Debian GNU/Hurd [[distribution|running/debian]] offers *LiveCDs and QEMU images*
-to test-drive the Hurd in a real life system with access to about 
-68% of the Debian software archive. 
-
-The most recent version of the Debian port at the time of writing 
-was published on 2011 July 1st.
+[[!img hurd-iceweasel-screenshot-2012-03-21.png size=300x
+alt="Iceweasel running on GNU/Hurd"
+title="Iceweasel running on GNU/Hurd"
+align="right"
+]]
+[[Debian GNU/Hurd|running/debian]] closely tracks the progress of the Hurd (and
+often includes new features).  They offer *LiveCDs and QEMU images* to
+test-drive the Hurd, and about 75% of the Debian software archive are
+available.  The most recent version of the Debian GNU/Hurd port at the time of
+writing was published on 2012 February 21st.
 
-[[Arch_Hurd|hurd/running/arch_hurd]] offers *LiveCDs* for testing and
-install.
+[[hurd/running/Arch_Hurd]] offers *LiveCDs* for testing and installation.
 
+[[hurd/running/Nix]] provides QEMU images.
 
 That said, the last official release of the Hurd 
 without the Debian parts was 0.2 done in 1997. 
diff --git a/hurd/status/hurd-iceweasel-screenshot-2012-03-21.png b/hurd/status/hurd-iceweasel-screenshot-2012-03-21.png
new file mode 100644
index 00000000..7dcc6d59
--- /dev/null
+++ b/hurd/status/hurd-iceweasel-screenshot-2012-03-21.png
diff --git a/hurd/translator/nfs.mdwn b/hurd/translator/nfs.mdwn
index 384144dc..bf24370a 100644
--- a/hurd/translator/nfs.mdwn
+++ b/hurd/translator/nfs.mdwn
@@ -13,4 +13,6 @@ Translator acting as a NFS client.
 
 # See Also
 
+  * [[libnetfs: `io_map`|open_issues/libnetfs_io_map]] issue
+
   * [[open_issues/libnfs]]