Merge branch 'master' of flubber:~hurd-web/hurd-web

4 files changed, 27 insertions, 26 deletions

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/status.mdwn b/hurd/status.mdwn
index 87de1349..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
@@ -22,7 +22,6 @@ 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
@@ -30,12 +29,6 @@ servers in one Hurd instance with gdb running on another Hurd
 instance.  You can run the X window system, applications that use it such as
 gnumeric, iceweasel, and advanced server applications like the Apache webserver.
 
-[[!img hurd-iceweasel-screenshot-2012-03-21.png size=300x
-alt="Iceweasel running on GNU/Hurd"
-title="Iceweasel running on GNU/Hurd"
-align="right"]]
-
-
 On the negative side, the support for character devices (like sound
 cards) and other hardware is mostly missing.  Although the [[POSIX
 interface|faq/posix_compatibility]] is provided, some additional interfaces
@@ -47,25 +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*, since 2010 *Arch*, and since 2012 *Nix*.
+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 
-75% of the Debian software archive. 
-
-The most recent version of the Debian port at the time of writing 
-was published on 2012 February 21st.
+[[!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.
 
-[[Nix|hurd/running/qemu]] provides qemu images.
+[[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.