Merging upstream version 5.6.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 25 insertions, 24 deletions

diff --git a/doc/man/txt/xzdiff.txt b/doc/man/txt/xzdiff.txt
index 681b00c..cb61372 100644
--- a/doc/man/txt/xzdiff.txt
+++ b/doc/man/txt/xzdiff.txt
@@ -1,37 +1,38 @@
 XZDIFF(1)                          XZ Utils                          XZDIFF(1)
 
-
-
 NAME
        xzcmp, xzdiff, lzcmp, lzdiff - compare compressed files
 
 SYNOPSIS
-       xzcmp [cmp_options] file1 [file2]
-       xzdiff [diff_options] file1 [file2]
-       lzcmp [cmp_options] file1 [file2]
-       lzdiff [diff_options] file1 [file2]
+       xzcmp [option...]  file1 [file2]
+       xzdiff ...
+       lzcmp ...
+       lzdiff ...
 
 DESCRIPTION
-       xzcmp  and  xzdiff  invoke  cmp(1)  or diff(1) on files compressed with
-       xz(1), lzma(1), gzip(1), bzip2(1), lzop(1), or  zstd(1).   All  options
-       specified  are  passed directly to cmp(1) or diff(1).  If only one file
-       is specified, then the files compared are file1 (which must have a suf-
-       fix  of  a  supported compression format) and file1 from which the com-
-       pression format suffix has been stripped.  If two files are  specified,
-       then  they  are uncompressed if necessary and fed to cmp(1) or diff(1).
-       The exit status from cmp(1) or diff(1) is preserved unless a decompres-
-       sion error occurs; then exit status is 2.
-
-       The names lzcmp and lzdiff are provided for backward compatibility with
-       LZMA Utils.
+       xzcmp  and  xzdiff  compare uncompressed contents of two files.  Uncom-
+       pressed data and options are passed to cmp(1) or diff(1) unless  --help
+       or --version is specified.
 
-SEE ALSO
-       cmp(1), diff(1), xz(1), gzip(1), bzip2(1), lzop(1), zstd(1), zdiff(1)
+       If  both  file1 and file2 are specified, they can be uncompressed files
+       or files in formats that xz(1), gzip(1), bzip2(1), lzop(1), zstd(1), or
+       lz4(1) can decompress.  The required decompression commands are  deter-
+       mined  from  the  filename suffixes of file1 and file2.  A file with an
+       unknown suffix is assumed to be either uncompressed or in a format that
+       xz(1) can decompress.
 
-BUGS
-       Messages from the cmp(1) or diff(1) programs refer to  temporary  file-
-       names instead of those specified.
+       If only one filename is provided, file1 must have a suffix  of  a  sup-
+       ported compression format and the name for file2 is assumed to be file1
+       with the compression format suffix removed.
 
+       The  commands  lzcmp and lzdiff are provided for backward compatibility
+       with LZMA Utils.
 
+EXIT STATUS
+       If a decompression error occurs, the exit status is 2.   Otherwise  the
+       exit status of cmp(1) or diff(1) is used.
+
+SEE ALSO
+       cmp(1), diff(1), xz(1), gzip(1), bzip2(1), lzop(1), zstd(1), lz4(1)
 
-Tukaani                           2021-06-04                         XZDIFF(1)
+Tukaani                           2024-02-13                         XZDIFF(1)