[Emacs-diffs] /srv/bzr/emacs/trunk r104878: * dired.texi (Subdirectories in Dired): Clarify the `C-u k'

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 104878
fixes bug(s): http://debbugs.gnu.org/7125
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sat 2011-07-02 17:42:37 +0200
message:
  * dired.texi (Subdirectories in Dired): Clarify the `C-u k'
  doesn't actually delete any files (bug#7125).
modified:
  doc/emacs/ChangeLog
  doc/emacs/dired.texi

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2011-07-02 13:40:21 +0000
+++ b/doc/emacs/ChangeLog       2011-07-02 15:42:37 +0000
@@ -1,5 +1,8 @@
 2011-07-02  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * dired.texi (Subdirectories in Dired): Clarify the `C-u k'
+       doesn't actually delete any files (bug#7125).
+
        * picture-xtra.texi (Rectangles in Picture): Clarify the prefix
        argument for `C-c C-k' (bug#7391).
 

=== modified file 'doc/emacs/dired.texi'
--- a/doc/emacs/dired.texi      2011-02-19 19:40:59 +0000
+++ b/doc/emacs/dired.texi      2011-07-02 15:42:37 +0000
@@ -984,8 +984,9 @@
 
 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 (@pxref{Dired Updating}).  You can also
-hide and show inserted subdirectories (@pxref{Hiding Subdirectories}).
+line to remove the subdirectory listing (@pxref{Dired Updating}).  You
+can also hide and show inserted subdirectories (@pxref{Hiding
+Subdirectories}).
 
 @ifnottex
 @include dired-xtra.texi
@@ -1145,9 +1146,9 @@
 
   If you use @kbd{k} with a numeric prefix argument to kill the line
 for a file that is a directory, which you have inserted in the Dired
-buffer as a subdirectory, it deletes that subdirectory from the buffer
-as well.  Typing @kbd{C-u k} on the header line for a subdirectory
-also deletes the subdirectory from the Dired buffer.
+buffer as a subdirectory, it removed that subdirectory line from the
+buffer as well.  Typing @kbd{C-u k} on the header line for a
+subdirectory also removes the subdirectory line from the Dired buffer.
 
   The @kbd{g} command brings back any individual lines that you have
 killed in this way, but not subdirectories---you must use @kbd{i} to