fix for #693463, part of the zdiff man page edits are no longer needed

[debian/gzip] / gzip.1

diff --git a/gzip.1 b/gzip.1
index 06986eb02eb32908daa76462da612532fb3ab8ba..4817180da9d09ea33cdd8ab02410ebf162bef560 100644 (file)
--- a/gzip.1
+++ b/gzip.1
@@ -72,7 +72,7 @@ legal.
 .PP
 .I gunzip
 takes a list of files on its command line and replaces each
 .PP
 .I gunzip
 takes a list of files on its command line and replaces each

-file whose name ends with .gz, -gz, .z, -z, _z or .Z
+file whose name ends with .gz, -gz, .z, -z, or _z (ignoring case)

 and which begins with the correct magic number with an uncompressed
 file without the original extension.
 .I gunzip
 and which begins with the correct magic number with an uncompressed
 file without the original extension.
 .I gunzip


@@ -121,7 +121,13 @@ Files created by
 .I zip
 can be uncompressed by gzip only if they have a single member compressed
 with the 'deflation' method. This feature is only intended to help
 .I zip
 can be uncompressed by gzip only if they have a single member compressed
 with the 'deflation' method. This feature is only intended to help

-conversion of tar.zip files to the tar.gz format. To extract zip files
+conversion of tar.zip files to the tar.gz format.  To extract a
+.I zip
+file with a single member, use a command like
+.I "gunzip <foo.zip"
+or
+.IR "gunzip -S .zip foo.zip" .
+To extract zip files

 with several members, use
 .I unzip
 instead of
 with several members, use
 .I unzip
 instead of


@@ -170,6 +176,16 @@ number of used disk blocks almost never increases.
 .I gzip
 preserves the mode, ownership and timestamps of files when compressing
 or decompressing.
 .I gzip
 preserves the mode, ownership and timestamps of files when compressing
 or decompressing.

+.PP
+The
+.I gzip
+file format is specified in P. Deutsch, \s-1GZIP\s0 file format
+specification version 4.3, <http://www.ietf.org/rfc/rfc1952.txt>,
+Internet RFC 1952 (May 1996).  The
+.I zip
+deflation format is specified in P. Deutsch, \s-1DEFLATE\s0 Compressed
+Data Format Specification version 1.3,
+<http://www.ietf.org/rfc/rfc1951.txt>, Internet RFC 1951 (May 1996).

 
 .SH OPTIONS
 .TP
 
 .SH OPTIONS
 .TP


@@ -194,7 +210,7 @@ is read from or written to a terminal. If the input data is not in
 a format recognized by
 .I gzip,
 and if the option --stdout is also given, copy the input data without change
 a format recognized by
 .I gzip,
 and if the option --stdout is also given, copy the input data without change

-to the standard ouput: let
+to the standard output: let

 .I zcat
 behave as
 .I cat.
 .I zcat
 behave as
 .I cat.


@@ -275,16 +291,14 @@ will descend into the directory and compress all the files it finds there
 ).
 .TP
 .B \-S .suf   --suffix .suf
 ).
 .TP
 .B \-S .suf   --suffix .suf

-Use suffix .suf instead of .gz. Any suffix can be given, but suffixes
+When compressing, use suffix .suf instead of .gz.
+Any non-empty suffix can be given, but suffixes

 other than .z and .gz should be avoided to avoid confusion when files
 other than .z and .gz should be avoided to avoid confusion when files

-are transferred to other systems.  A null suffix forces gunzip to  try
-decompression on all given files regardless of suffix, as in:
+are transferred to other systems.

 
 

-    gunzip -S "" *       (*.* for MSDOS)
+When decompressing, add .suf to the beginning of the list of
+suffixes to try, when deriving an output file name from an input file name.

 
 

-Previous versions of gzip used
-the .z suffix. This was changed to avoid a conflict with
-.IR pack "(1)".

 .TP
 .B \-t --test
 Test. Check the compressed file integrity.
 .TP
 .B \-t --test
 Test. Check the compressed file integrity.


@@ -367,20 +381,19 @@ explicit command line parameters. For example:
 On Vax/VMS, the name of the environment variable is GZIP_OPT, to
 avoid a conflict with the symbol set for invocation of the program.
 .SH "SEE ALSO"
 On Vax/VMS, the name of the environment variable is GZIP_OPT, to
 avoid a conflict with the symbol set for invocation of the program.
 .SH "SEE ALSO"

-znew(1), zcmp(1), zmore(1), zforce(1), gzexe(1), zip(1), unzip(1), compress(1),
-pack(1), compact(1)
+znew(1), zcmp(1), zmore(1), zforce(1), gzexe(1), zip(1), unzip(1), compress(1)

 .PP
 The
 .I gzip
 file format is specified in P. Deutsch, \s-1GZIP\s0 file format
 specification version 4.3,
 .PP
 The
 .I gzip
 file format is specified in P. Deutsch, \s-1GZIP\s0 file format
 specification version 4.3,

-.BR <ftp://ftp.isi.edu/in-notes/rfc1952.txt> ,
+.BR <http://www.ietf.org/rfc/rfc1952.txt> ,

 Internet RFC 1952 (May 1996).
 The
 .I zip
 deflation format is specified in P. Deutsch, \s-1DEFLATE\s0 Compressed
 Data Format Specification version 1.3,
 Internet RFC 1952 (May 1996).
 The
 .I zip
 deflation format is specified in P. Deutsch, \s-1DEFLATE\s0 Compressed
 Data Format Specification version 1.3,

-.BR <ftp://ftp.isi.edu/in-notes/rfc1951.txt> ,
+.BR <http://www.ietf.org/rfc/rfc1951.txt> ,

 Internet RFC 1951 (May 1996).
 .SH "DIAGNOSTICS"
 Exit status is normally 0;
 Internet RFC 1951 (May 1996).
 .SH "DIAGNOSTICS"
 Exit status is normally 0;


@@ -457,7 +470,7 @@ GNU tar. Make sure that the same block size (-b option of tar) is used
 for reading and writing compressed data on tapes.  (This example
 assumes you are using the GNU version of tar.)
 .SH BUGS
 for reading and writing compressed data on tapes.  (This example
 assumes you are using the GNU version of tar.)
 .SH BUGS

-The gzip format represents the the input size modulo 2^32, so the
+The gzip format represents the input size modulo 2^32, so the

 --list option reports incorrect uncompressed sizes and compression
 ratios for uncompressed files 4 GB and larger.  To work around this
 problem, you can use the following command to discover a large
 --list option reports incorrect uncompressed sizes and compression
 ratios for uncompressed files 4 GB and larger.  To work around this
 problem, you can use the following command to discover a large


@@ -474,7 +487,7 @@ the default compression level (-6). On some highly redundant files,
 compresses better than
 .I gzip.
 .SH "COPYRIGHT NOTICE"
 compresses better than
 .I gzip.
 .SH "COPYRIGHT NOTICE"

-Copyright \(co 1998, 1999, 2001 Free Software Foundation, Inc.
+Copyright \(co 1998, 1999, 2001, 2002 Free Software Foundation, Inc.

 .br
 Copyright \(co 1992, 1993 Jean-loup Gailly
 .PP
 .br
 Copyright \(co 1992, 1993 Jean-loup Gailly
 .PP