Merge from emacs--rel--22

[gnu-emacs] / doc / emacs / dired.texi

diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 3dda3f588ebab59bb1773823c63936a54c4af564..72cc04dfcd3ad8faf1c5484b64b546e29aeb17d6 100644 (file)
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -1,9 +1,11 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Dired, Calendar/Diary, Rmail, Top
 @chapter Dired, the Directory Editor
+@c This node is referenced in the tutorial.  When renaming or deleting
+@c it, the tutorial needs to be adjusted.
 @cindex Dired
 @cindex file management
 
@@ -919,7 +921,8 @@ describing that subdirectory).
 
 Use the @kbd{l} command (@code{dired-do-redisplay}) to update the
 subdirectory's contents.  Use @kbd{C-u k} on the subdirectory header
-line to delete the subdirectory.  @xref{Dired Updating}.
+line to delete the subdirectory (@pxref{Dired Updating}).  You can also
+hide and show inserted subdirectories (@pxref{Hiding Subdirectories}).
 
 
 
@@ -981,8 +984,9 @@ Move down to the next directory-file line (@code{dired-prev-dirline}).
 
 @node Hiding Subdirectories
 @section Hiding Subdirectories
+@cindex hiding subdirectories (Dired)
+@cindex showing hidden subdirectories (Dired)
 
-@cindex hiding in Dired (Dired)
   @dfn{Hiding} a subdirectory means to make it invisible, except for its
 header line.
 
@@ -990,9 +994,9 @@ header line.
 @item $
 @findex dired-hide-subdir
 @kindex $ @r{(Dired)}
-Hide or reveal the subdirectory that point is in, and move point to the
-next subdirectory (@code{dired-hide-subdir}).  A numeric argument serves
-as a repeat count.
+Hide or show the subdirectory that point is in, and move point to the
+next subdirectory (@code{dired-hide-subdir}).  This is a toggle.  A
+numeric argument serves as a repeat count.
 
 @item M-$
 @findex dired-hide-all
@@ -1011,6 +1015,8 @@ can use hiding to temporarily exclude subdirectories from operations
 without having to remove the Dired marks on files in those
 subdirectories.
 
+@xref{Dired Updating}, for how to insert or delete a subdirectory listing.
+
 @node Dired Updating
 @section Updating the Dired Buffer
 @cindex updating Dired buffer