svn path=/nixos/trunk/; revision=7767

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>

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.
     ";
   }
+  */
 
   
   {