2010-01-10 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	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

@@ -1,3 +1,10 @@
+2010-01-10  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	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  <t-tujikawa@users.sourceforge.net>
 
 	Added --bt-save-metadata option to -i list options.

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

doc/aria2c.1.html

@@ -763,7 +763,8 @@ downloading a file like BitTorrent.</p></div>
 </dt>
 <dd>
 <p>
-  The file name of the downloaded file.
+  The file name of the downloaded file. When <strong>-Z</strong> option is used, this
+  option is ignored.
 </p>
 </dd>
 </dl></div>
@@ -3545,7 +3546,7 @@ files in the program, then also delete it here.</p></div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2010-01-10 15:46:41 JST
+Last updated 2010-01-10 15:53:40 JST
 </div>
 </div>
 </body>

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.

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.")