2.6.24

 Documentation

diff --git a/Documentation/nfsroot.txt b/Documentation/nfsroot.txt
index 16a7cae..31b3291 100644
--- a/Documentation/nfsroot.txt
+++ b/Documentation/nfsroot.txt
@@ -92,8 +92,10 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf+
>
   autoconfiguration.
 
   The <autoconf> parameter can appear alone as the value to the `ip'
-  parameter (without all the ':' characters before) in which case auto-
-  configuration is used.
+  parameter (without all the ':' characters before).  If the value is
+  "ip=off" or "ip=none", no autoconfiguration will take place, otherwise
+  autoconfiguration will take place.  The most common way to use this
+  is "ip=dhcp".
 
   <client-ip>   IP address of the client.
 
@@ -142,8 +144,10 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoco+
nf>
       into the kernel will be used, regardless of the value of
       this option.
 
-                  off or none: don't use autoconfiguration (default)
+                  off or none: don't use autoconfiguration
+            (do static IP assignment instead)
         on or any:   use any protocol available in the kernel
+                (default)
         dhcp:        use DHCP
         bootp:       use BOOTP
         rarp:        use RARP