Merge from origin/emacs-26

936a8f3 (origin/emacs-26) Document Emacs 26 behavior of Dired's 'Z' o...
99f99a1 ; Minor editing change in windows.texi
13bb665 Fix a typo in the Emacs manual

# Conflicts:
#	etc/NEWS

3 files changed, 10 insertions, 4 deletions

diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 1b03a3967aa..1612fc75d67 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -779,9 +779,15 @@ suitable guess made using the variables @code{lpr-command} and
 @item Z
 Compress the specified files (@code{dired-do-compress}).  If the file
 appears to be a compressed file already, uncompress it instead.  Each
-marked file is compressed into its own archive.  This uses the
+marked file is compressed into its own archive; this uses the
 @command{gzip} program if it is available, otherwise it uses
-@command{compress}.
+@command{compress}.  On a directory name, this command produces a
+compressed @file{.tar.gz} archive containing all of the directory's
+files, by running the @command{tar} command with output piped to
+@command{gzip}.  To allow decompression of compressed directories,
+typing @kbd{Z} on a @file{.tar.gz} or @file{.tgz} archive file unpacks
+all the files in the archive into a directory whose name is the
+archive name with the extension removed.
 
 @findex dired-do-compress-to
 @kindex c @r{(Dired)}
diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index a17ef4938e6..c975b588411 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -318,7 +318,7 @@ effect of a @kbd{d} command in most cases.  It undeletes the current
 message if the current message is deleted.  Otherwise it moves backward
 to previous messages until a deleted message is found, and undeletes
 that message.  A numeric prefix argument serves as a repeat count, to
-allow deletion of several messages in a single command.
+allow undeletion of several messages in a single command.
 
   You can usually undo a @kbd{d} with a @kbd{u} because the @kbd{u}
 moves back to and undeletes the message that the @kbd{d} deleted.  But
diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi
index 8cc514494dc..93a68e9ca22 100644
--- a/doc/emacs/windows.texi
+++ b/doc/emacs/windows.texi
@@ -553,7 +553,7 @@ buffer.  @xref{Follow Mode}.
 between neighboring windows in a frame.  @kbd{M-x windmove-right}
 selects the window immediately to the right of the currently selected
 one, and similarly for the left, up, and down
-counterparts.  @kbd{M-x windmove-default-keybindings} binds these
+counterparts.  @w{@kbd{M-x windmove-default-keybindings}} binds these
 commands to @kbd{S-right} etc.; doing so disables shift selection for
 those keys (@pxref{Shift Selection}).