From ea86dbb2455f71fe6b4872ebc86ae6bd039ce598 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sun, 10 Jan 2010 06:55:35 +0000 Subject: [PATCH] 2010-01-10 Tatsuhiro Tsujikawa Added following sentance to the help message of --out option: --out option is ignored when -Z is used. * doc/aria2c.1.txt * src/usage_text.h --- ChangeLog | 7 +++++++ doc/aria2c.1 | 4 +++- doc/aria2c.1.html | 5 +++-- doc/aria2c.1.txt | 4 +++- src/usage_text.h | 3 ++- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a0f640cb..dc7a1617 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-01-10 Tatsuhiro Tsujikawa + + Added following sentance to the help message of --out option: + --out option is ignored when -Z is used. + * doc/aria2c.1.txt + * src/usage_text.h + 2010-01-10 Tatsuhiro Tsujikawa Added --bt-save-metadata option to -i list options. diff --git a/doc/aria2c.1 b/doc/aria2c.1 index 8aced39a..0f001737 100644 --- a/doc/aria2c.1 +++ b/doc/aria2c.1 @@ -172,7 +172,9 @@ Specify comma separated hostnames or domains where proxy should not be used\&. .PP \fB\-o\fR, \fB\-\-out\fR=FILE .RS 4 -The file name of the downloaded file\&. +The file name of the downloaded file\&. When +\fB\-Z\fR +option is used, this option is ignored\&. .RE .if n \{\ .sp diff --git a/doc/aria2c.1.html b/doc/aria2c.1.html index 2e476e99..804e94de 100644 --- a/doc/aria2c.1.html +++ b/doc/aria2c.1.html @@ -763,7 +763,8 @@ downloading a file like BitTorrent.

- The file name of the downloaded file. + The file name of the downloaded file. When -Z option is used, this + option is ignored.

@@ -3545,7 +3546,7 @@ files in the program, then also delete it here.

diff --git a/doc/aria2c.1.txt b/doc/aria2c.1.txt index 318c0663..47d15249 100644 --- a/doc/aria2c.1.txt +++ b/doc/aria2c.1.txt @@ -121,7 +121,9 @@ HTTP/FTP Options used. *-o*, *--out*=FILE:: - The file name of the downloaded file. + + The file name of the downloaded file. When *-Z* option is used, this + option is ignored. [NOTE] In Metalink or BitTorrent download you cannot specify file name. diff --git a/src/usage_text.h b/src/usage_text.h index 8fbc5067..5c72d1cf 100644 --- a/src/usage_text.h +++ b/src/usage_text.h @@ -36,7 +36,8 @@ #define TEXT_DIR \ _(" -d, --dir=DIR The directory to store the downloaded file.") #define TEXT_OUT \ - _(" -o, --out=FILE The file name of the downloaded file.") + _(" -o, --out=FILE The file name of the downloaded file. When -Z\n"\ + " option is used, this option is ignored.") #define TEXT_LOG \ _(" -l, --log=LOG The file name of the log file. If '-' is\n" \ " specified, log is written to stdout.")