Fix small inconsistencies between manual pages and binary help output.
* src/xz/message.c (message_help): Cover --uncompress, --to-stdout and
mention that --memory is alias for --memlimit.
* src/xz/xz.1: Mention obsoleted --memory option.
* src/xzdec/xzdec.c: Mention --to-stdout and --uncompress option in
help, better describe why options are ignored and move all ignored
options to the end of whole list.
---
src/xz/message.c | 8 +++++---
src/xz/xz.1 | 2 +-
src/xzdec/xzdec.c | 10 ++++++----
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/xz/message.c b/src/xz/message.c
index abdf056..7b00b92 100644
--- a/src/xz/message.c
+++ b/src/xz/message.c
@@ -1116,7 +1116,8 @@ message_help(bool long_help)
puts(_(
" -z, --compress force compression\n"
-" -d, --decompress force decompression\n"
+" -d, --decompress, --uncompress\n"
+" force decompression\n"
" -t, --test test compressed file integrity\n"
" -l, --list list information about .xz files"));
@@ -1126,7 +1127,8 @@ message_help(bool long_help)
puts(_(
" -k, --keep keep (don't delete) input files\n"
" -f, --force force overwrite of output file and (de)compress links\n"
-" -c, --stdout write to standard output and don't delete input
files"));
+" -c, --stdout, --to-stdout\n"
+" write to standard output and don't delete input
files"));
if (long_help) {
puts(_(
@@ -1176,7 +1178,7 @@ message_help(bool long_help)
puts(_( // xgettext:no-c-format
" --memlimit-compress=LIMIT\n"
" --memlimit-decompress=LIMIT\n"
-" -M, --memlimit=LIMIT\n"
+" -M, --memlimit=LIMIT, (old alias --memory=LIMIT)\n"
" set memory usage limit for compression,
decompression,\n"
" or both; LIMIT is in bytes, % of RAM, or 0 for
defaults"));
diff --git a/src/xz/xz.1 b/src/xz/xz.1
index 156fd8f..8a6db71 100644
--- a/src/xz/xz.1
+++ b/src/xz/xz.1
@@ -918,7 +918,7 @@ See
for possible ways to specify the
.IR limit .
.TP
-\fB\-M\fR \fIlimit\fR, \fB\-\-memlimit=\fIlimit\fR, \fB\-\-memory=\fIlimit
+\fB\-M\fR \fIlimit\fR, \fB\-\-memlimit=\fIlimit\fR, (old alias
\fB\-\-memory=\fIlimit\fR)
This is equivalent to specifying \fB\-\-memlimit\-compress=\fIlimit
\fB\-\-memlimit\-decompress=\fIlimit\fR.
.TP
diff --git a/src/xzdec/xzdec.c b/src/xzdec/xzdec.c
index b7830db..48ac1fe 100644
--- a/src/xzdec/xzdec.c
+++ b/src/xzdec/xzdec.c
@@ -64,13 +64,15 @@ help(void)
"Usage: %s [OPTION]... [FILE]...\n"
"Uncompress files in the ." TOOL_FORMAT " format to the standard output.\n"
"\n"
-" -c, --stdout (ignored)\n"
-" -d, --decompress (ignored)\n"
-" -k, --keep (ignored)\n"
" -q, --quiet specify *twice* to suppress errors\n"
-" -Q, --no-warn (ignored)\n"
" -h, --help display this help and exit\n"
" -V, --version display the version number and exit\n"
+" -c, --stdout, --to-stdout\n"
+" ignored, data are always written to standard output\n"
+" -d, --decompress, --uncompress\n"
+" ignored, only decompression is supported\n"
+" -k, --keep ignored, we never create/remove any files\n"
+" -Q, --no-warn ignored, we never use exit status 2\n"
"\n"
"With no FILE, or when FILE is -, read standard input.\n"
"\n"
--
1.8.1.4
