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

1 files changed, 8 insertions, 2 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)}