Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[powerpc.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 635f3e2..b4799ef 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1112,8 +1112,8 @@ config HFS_FS
        help
          If you say Y here, you will be able to mount Macintosh-formatted
          floppy disks and hard drive partitions with full read-write access.
        help
          If you say Y here, you will be able to mount Macintosh-formatted
          floppy disks and hard drive partitions with full read-write access.

-         Please read <file:fs/hfs/HFS.txt> to learn about the available mount
-         options.
+         Please read <file:Documentation/filesystems/hfs.txt> to learn about
+         the available mount options.

 
          To compile this file system support as a module, choose M here: the
          module will be called hfs.
 
          To compile this file system support as a module, choose M here: the
          module will be called hfs.


@@ -1305,7 +1305,7 @@ config JFFS2_COMPRESSION_OPTIONS
        help
          Enabling this option allows you to explicitly choose which
          compression modules, if any, are enabled in JFFS2. Removing
        help
          Enabling this option allows you to explicitly choose which
          compression modules, if any, are enabled in JFFS2. Removing

-         compressors and mean you cannot read existing file systems,
+         compressors can mean you cannot read existing file systems,

          and enabling experimental compressors can mean that you
          write a file system which cannot be read by a standard kernel.
 
          and enabling experimental compressors can mean that you
          write a file system which cannot be read by a standard kernel.
 


@@ -2130,4 +2130,3 @@ source "fs/nls/Kconfig"
 source "fs/dlm/Kconfig"
 
 endmenu
 source "fs/dlm/Kconfig"
 
 endmenu

-