Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[~andy/linux] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 5d0c4be43dba1f6e929ff50fabcefcff3adaf1db..e54be7058359e0beee537f4f5d21d7544148c687 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -363,12 +363,15 @@ config INOTIFY
        bool "Inotify file change notification support"
        default y
        ---help---
        bool "Inotify file change notification support"
        default y
        ---help---

-         Say Y here to enable inotify support and the /dev/inotify character
-         device.  Inotify is a file change notification system and a
+         Say Y here to enable inotify support and the associated system
+         calls.  Inotify is a file change notification system and a

          replacement for dnotify.  Inotify fixes numerous shortcomings in
          dnotify and introduces several new features.  It allows monitoring
          replacement for dnotify.  Inotify fixes numerous shortcomings in
          dnotify and introduces several new features.  It allows monitoring

-         of both files and directories via a single open fd.  Multiple file
-         events are supported.
+         of both files and directories via a single open fd.  Other features
+         include multiple file events, one-shot support, and unmount
+         notification.
+
+         For more information, see Documentation/filesystems/inotify.txt

 
          If unsure, say Y.
 
 
          If unsure, say Y.