From e3c5b9e752848e8dc86c59dacb3c7cb16dce0162 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Jan 2007 11:18:23 +0000
Subject: [PATCH] svn path=/nixos/trunk/; revision=7767

---
 doc/manual/options-to-docbook.xsl | 2 +-
 system/options.nix                | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index 5ed80f10bda..2e139378e1d 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -24,7 +24,7 @@
                <option>
                  <xsl:for-each select="attr[@name = 'name']/list/string">
                    <xsl:value-of select="@value" />
-                   <xsl:if test="position() != last()">.</xsl:if> 
+                   <xsl:if test="position() != last()">.</xsl:if>
                  </xsl:for-each>
                </option>
              </term>
diff --git a/system/options.nix b/system/options.nix
index 827c50eef5a..2bef61323d4 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -227,7 +227,7 @@
       <option>-o</option> flag; defaults to <literal>\"defaults\"</literal>).
 
       Instead of specifying <literal>device</literal>, you can also
-      specify a volume label (<literal>volume</literal>) for file
+      specify a volume label (<literal>label</literal>) for file
       systems that support it, such as ext2/ext3 (see <command>mke2fs
       -L</command>).
     ";
@@ -339,7 +339,8 @@
     ";
   }
 
-      
+
+  /*      
   {
     name = ["services" "mingetty" "waitOnMounts"];
     default = false;
@@ -350,6 +351,7 @@
       separate partition, you may want to turn this on.
     ";
   }
+  */
 
   
   {