1 files changed, 11 insertions, 18 deletions

diff --git a/fs/Kconfig b/fs/Kconfig
index 8cd2417a14db..d57f363ea1ab 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1871,20 +1871,14 @@ config CIFS
           file servers such as Windows 2000 (including Windows 2003, NT 4  
           and Windows XP) as well by Samba (which provides excellent CIFS
           server support for Linux and many other operating systems). Limited
-          support for Windows ME and similar servers is provided as well. 
-          You must use the smbfs client filesystem to access older SMB servers
-          such as OS/2 and DOS.
+          support for OS/2 and Windows ME and similar servers is provided as well.
 
           The intent of the cifs module is to provide an advanced
-          network file system client for mounting to CIFS compliant servers, 
+          network file system client for mounting to CIFS compliant servers,
           including support for dfs (hierarchical name space), secure per-user
           session establishment, safe distributed caching (oplock), optional
-          packet signing, Unicode and other internationalization improvements, 
-          and optional Winbind (nsswitch) integration. You do not need to enable
-          cifs if running only a (Samba) server. It is possible to enable both
-          smbfs and cifs (e.g. if you are using CIFS for accessing Windows 2003
-          and Samba 3 servers, and smbfs for accessing old servers). If you need 
-          to mount to Samba or Windows from this machine, say Y.
+          packet signing, Unicode and other internationalization improvements. 
+          If you need to mount to Samba or Windows from this machine, say Y.
 
 config CIFS_STATS
         bool "CIFS statistics"
@@ -1977,14 +1971,13 @@ config CIFS_EXPERIMENTAL
           depends on CIFS && EXPERIMENTAL
           help
             Enables cifs features under testing. These features are
-            experimental and currently include support for writepages
-            (multipage writebehind performance improvements) and directory
-            change notification ie fcntl(F_DNOTIFY) as well as some security
-            improvements.  Some also depend on setting at runtime the
-            pseudo-file /proc/fs/cifs/Experimental (which is disabled by
-            default). See the file fs/cifs/README for more details.
-
-            If unsure, say N.
+            experimental and currently include DFS support and directory 
+            change notification ie fcntl(F_DNOTIFY), as well as the upcall
+            mechanism which will be used for Kerberos session negotiation
+            and uid remapping.  Some of these features also may depend on 
+            setting a value of 1 to the pseudo-file /proc/fs/cifs/Experimental
+            (which is disabled by default). See the file fs/cifs/README 
+            for more details.  If unsure, say N.
 
 config CIFS_UPCALL
           bool "Kerberos/SPNEGO advanced session setup (EXPERIMENTAL)"