2 files changed, 11 insertions, 0 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index ce2a5e998e3..0102e028d49 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-13  Glenn Morris  <rgm@gnu.org>
+
+        * dired.texi (Dired Enter): Mention --dired.  (Bug#9039)
+
 2011-07-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * mark.texi (Mark Ring): Clarify how many locations are saved
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index fb3521e4316..501c4152e6a 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -81,6 +81,13 @@ specified, the @code{ls} switches can include short options (that is,
 single characters) requiring no arguments, and long options (starting
 with @samp{--}) whose arguments are specified with @samp{=}.
 
+@vindex dired-use-ls-dired
+  Note that Dired automatically adds the option @samp{--dired}, if
+your @code{ls} program supports it, unless you explicitly set
+the variable @code{dired-use-ls-dired} to @code{nil}.  Without this
+option, Dired will have trouble parsing some @samp{unusual} file-names.
+See the documentation of @code{dired-use-ls-dired} for more details.
+
   On MS-Windows and MS-DOS systems, Emacs @emph{emulates} @code{ls};
 see @ref{ls in Lisp}, for options and peculiarities of that emulation.