sync with gzip 1.2.4a

Ok'd by: millert

5 files changed, 13 insertions, 14 deletions

diff --git a/gnu/usr.bin/gzip/README b/gnu/usr.bin/gzip/README
index fdd73114487..590fdc17c74 100644
--- a/gnu/usr.bin/gzip/README
+++ b/gnu/usr.bin/gzip/README
@@ -39,8 +39,8 @@ For all machines, use "make check" to check that gzip was compiled
 correctly.  Try compiling gzip without any optimization if you have a
 problem.
 
-Please send all comments and bug reports by electronic mail to:
-   Jean-loup Gailly <jloup@chorus.fr>
+Please send all comments and bug reports by electronic mail to
+<bug-gzip@gnu.org>.
 
 or, if this fails, to bug-gnu-utils@prep.ai.mit.edu.
 Bug reports should ideally include:
diff --git a/gnu/usr.bin/gzip/THANKS b/gnu/usr.bin/gzip/THANKS
index 6a545cb6a18..dd8f7bfd8b3 100644
--- a/gnu/usr.bin/gzip/THANKS
+++ b/gnu/usr.bin/gzip/THANKS
@@ -1,4 +1,4 @@
-gzip was written by Jean-loup Gailly <jloup@chorus.fr>, with portions
+gzip was written by Jean-loup Gailly <gzip@gnu.org>, with portions
 written by Mark Adler (inflate.c), Peter Jannesen (unlzw.c) and
 Haruhiko Okumura (unlzh.c). The zip deflate format was defined by Phil Katz.
 Thanks to those who reported problems and suggested various
diff --git a/gnu/usr.bin/gzip/TODO b/gnu/usr.bin/gzip/TODO
index 865be925078..1335e632d18 100644
--- a/gnu/usr.bin/gzip/TODO
+++ b/gnu/usr.bin/gzip/TODO
@@ -55,4 +55,4 @@ Some of the planned features include:
 
 - Implement the -e (encrypt) option.
    
-Send comments to Jean-loup Gailly <jloup@chorus.fr>.
+Send comments to <bug-gzip@gnu.org>.
diff --git a/gnu/usr.bin/gzip/algorithm.doc b/gnu/usr.bin/gzip/algorithm.doc
index 24f7619ab69..52b199172b3 100644
--- a/gnu/usr.bin/gzip/algorithm.doc
+++ b/gnu/usr.bin/gzip/algorithm.doc
@@ -48,7 +48,7 @@ match, thus speeding up the whole process. If compression ratio is more
 important than speed, zip attempts a complete second search even if
 the first match is already long enough.
 
-The lazy match evaluation is no performed for the fastest compression
+The lazy match evaluation is not performed for the fastest compression
 modes (speed options -1 to -3). For these fast modes, new strings
 are inserted in the hash table only when no match was found, or
 when the match is not too long. This degrades the compression ratio
@@ -114,7 +114,7 @@ each with the following format:
   subfield data
 
 The subfield id can consist of two letters with some mnemonic value.
-Please send any such id to jloup@chorus.fr. Ids with a zero second
+Please send any such id to <gzip@gnu.org>. Ids with a zero second
 byte are reserved for future use. The following ids are defined:
 
   Ap (0x41, 0x70) : Apollo file type information
@@ -151,7 +151,7 @@ stamp of an encrypted file might be set to zero to avoid giving a clue
 about the construction of the random header.
 
 Jean-loup Gailly
-jloup@chorus.fr
+gzip@gnu.org
 
 References:
 
diff --git a/gnu/usr.bin/gzip/gzip.texi b/gnu/usr.bin/gzip/gzip.texi
index 07be37187d7..c60f7a69e9b 100644
--- a/gnu/usr.bin/gzip/gzip.texi
+++ b/gnu/usr.bin/gzip/gzip.texi
@@ -239,8 +239,8 @@ Decompress.
 Force compression or decompression even if the file has multiple links
 or the corresponding file already exists, or if the compressed data
 is read from or written to a terminal. If the input data is not in
-a format recognized by @code{gzip}, and if the option --stdout is also
-given, copy the input data without change to the standard ouput: let
+a format recognized by @code{gzip}, and if the option @samp{--stdout} is also
+given, copy the input data without change to the standard output: let
 @code{zcat} behave as @code{cat}. If @samp{-f} is not given, and
 when not running in the background, @code{gzip} prompts to verify
 whether an existing file should be overwritten.
@@ -268,7 +268,7 @@ such a file, you can use:
 zcat file.Z | wc -c
 @end example
 
-In combination with the --verbose option, the following fields are also
+In combination with the @samp{--verbose} option, the following fields are also
 displayed:
 
 @example
@@ -279,8 +279,8 @@ date & time: time stamp for the uncompressed file
 
 The crc is given as ffffffff for a file not in gzip format.
 
-With --verbose, the size totals and compression ratio for all files
-is also displayed, unless some sizes are unknown. With --quiet,
+With @samp{--verbose}, the size totals and compression ratio for all files
+is also displayed, unless some sizes are unknown. With @samp{--quiet},
 the title and totals lines are not displayed.
 
 @item --license
@@ -462,8 +462,7 @@ tapes.  (This example assumes you are using the GNU version of
 @cindex bugs
 
 If you find a bug in @code{gzip}, please send electronic mail to
-@w{@samp{jloup@@chorus.fr}} or, if this fails, to
-@w{@samp{bug-gnu-utils@@prep.ai.mit.edu}}.  Include the version number,
+@w{@samp{bug-gzip@@gnu.org}}.  Include the version number,
 which you can find by running @w{@samp{gzip -V}}.  Also include in your
 message the hardware and operating system, the compiler used to compile
 @code{gzip},