Merge branch 'async' of macbook:git/btrfs-unstable

[linux.git] / fs / nfs / Kconfig

diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index a43d07e7b9242addd57f704f5a65d15e0bae9813..cc1bb33b59b8d919b64c3b8c2895c3b08c6d80f5 100644 (file)
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -61,8 +61,8 @@ config NFS_V3_ACL
          If unsure, say N.
 
 config NFS_V4
-       bool "NFS client support for NFS version 4 (EXPERIMENTAL)"
-       depends on NFS_FS && EXPERIMENTAL
+       bool "NFS client support for NFS version 4"
+       depends on NFS_FS
        select RPCSEC_GSS_KRB5
        help
          This option enables support for version 4 of the NFS protocol
@@ -72,16 +72,16 @@ config NFS_V4
          space programs which can be found in the Linux nfs-utils package,
          available from http://linux-nfs.org/.
 
-         If unsure, say N.
+         If unsure, say Y.
 
 config NFS_V4_1
-       bool "NFS client support for NFSv4.1 (DEVELOPER ONLY)"
+       bool "NFS client support for NFSv4.1 (EXPERIMENTAL)"
        depends on NFS_V4 && EXPERIMENTAL
        help
          This option enables support for minor version 1 of the NFSv4 protocol
          (draft-ietf-nfsv4-minorversion1) in the kernel's NFS client.
 
-         Unless you're an NFS developer, say N.
+         If unsure, say N.
 
 config ROOT_NFS
        bool "Root file system on NFS"