2 files changed, 10 insertions, 3 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 9e2cf1871fe..82c8fc5a36a 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,10 @@
 2008-11-22  Juri Linkov  <juri@jurta.org>
 
+        * dired.texi (Dired Navigation): Change normal file name search option
+        from `non-nil' to `t'.  Add `dwim' option.
+
+2008-11-22  Juri Linkov  <juri@jurta.org>
+
         * custom.texi (Directory Variables): Rename ".dir-settings.el" to
         ".dir-locals.el".  Rename `define-project-bindings' to
         `dir-locals-set-class-variables'.  Rename `set-directory-project' to
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 82cf96f5e9a..e2518de6692 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -124,10 +124,12 @@ incremental search in the Dired buffer, looking for matches only
 amongst the file names and ignoring the rest of the text in the
 buffer.  @kbd{M-s f M-C-s} (@code{dired-isearch-filenames-regexp})
 does the same, using a regular expression search.  If you change the
-variable @var{dired-isearch-filenames} to non-@code{nil}, then the
+variable @var{dired-isearch-filenames} to @code{t}, then the
 usual search commands also limit themselves to the file names; for
-instance, @kbd{C-s} behaves like @kbd{M-s f C-s}.  @xref{Search}, for
-information about incremental search.
+instance, @kbd{C-s} behaves like @kbd{M-s f C-s}.  If the value is
+@code{dwim}, then search commands match the file names only when point
+was on a file name initially.  @xref{Search}, for information about
+incremental search.
 
   Some additional navigation commands are available when the Dired
 buffer includes several directories.  @xref{Subdirectory Motion}.