Merge from mainline.

2 files changed, 7 insertions, 11 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 2ce67bad6cb..47ae7ee3842 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-02  Glenn Morris  <rgm@gnu.org>
+
+        * dired-x.texi (Omitting Variables): Refer to add-dir-local-variable
+        instead of the obsoleted dired-omit-here-always.
+
 2011-02-28  Michael Albinus  <michael.albinus@gmx.de>
 
         * tramp.texi (Frequently Asked Questions): Add Emacs 24 to
diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index cde39ff6a62..dba99d9c6c7 100644
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -345,17 +345,8 @@ a directory local setting
 @end example
 
 @noindent
-to a @file{.dir-locals.el} file in that directory.
-
-@table @code
-@findex dired-omit-here-always
-@item dired-omit-here-always
-
-This is an interactive function that creates a local variables file exactly
-like the example above (if it does not already exist) in the
-@code{dir-locals-file} file in the current directory and then refreshes
-the directory listing.
-@end table
+to a @file{.dir-locals.el} file in that directory.  You can use the
+command @code{add-dir-local-variable} to do this.
 
 @vindex dired-omit-files
 @item dired-omit-files