2008-11-14 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Fixed wrong note position for -o option.
	* doc/aria2c.1.txt

ChangeLog

@@ -1,3 +1,8 @@
+2008-11-14  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Fixed wrong note position for -o option.
+	* doc/aria2c.1.txt
+	
 2008-11-14  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Fixed compile error without SSL/XML library.

doc/aria2c.1

@@ -1,11 +1,11 @@
 .\"     Title: aria2c
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
-.\"      Date: 11/11/2008
+.\"      Date: 11/14/2008
 .\"    Manual: 
 .\"    Source: 
 .\"
-.TH "ARIA2C" "1" "11/11/2008" "" ""
+.TH "ARIA2C" "1" "11/14/2008" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -130,6 +130,13 @@ Specify comma separated hostnames or domains to which proxy should not be used\&
 .RS 4
 The file name of the downloaded file\&.
 .RE
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+Note
+In Metalink, BitTorrent download you cannot specify file name\&. The file name specified here is only used when the URLs fed to aria2 is done by command line without \fB\-i\fR, \fB\-Z\fR option\&. For example: aria2c \-o myfile\&.zip http://mirror1/file\&.zip http://mirror2/file\&.zip
 .PP
 \fB\-\-proxy\-method\fR=METHOD
 .RS 4
@@ -141,13 +148,6 @@ or
 \fItunnel\fR\&. Default:
 \fItunnel\fR
 .RE
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-Note
-In Metalink, BitTorrent download you cannot specify file name\&. The file name specified here is only used when the URLs fed to aria2 is done by command line without \fB\-i\fR, \fB\-Z\fR option, like this: aria2c \-o myfile\&.zip http://mirror1/file\&.zip http://mirror2/file\&.zip
 .PP
 \fB\-R\fR, \fB\-\-remote\-time\fR[=\fItrue\fR|\fIfalse\fR]
 .RS 4

doc/aria2c.1.html

@@ -535,16 +535,6 @@ ARIA2C(1) Manual Page
   The file name of the downloaded file.
 </p>
 </dd>
-<dt>
-<strong>--proxy-method</strong>=METHOD
-</dt>
-<dd>
-<p>
-  Set the method to use in proxy request.
-  <em>METHOD</em> is either <em>get</em> or <em>tunnel</em>.
-  Default: <em>tunnel</em>
-</p>
-</dd>
 </dl></div>
 <div class="admonitionblock">
 <table><tr>
@@ -553,12 +543,22 @@ ARIA2C(1) Manual Page
 </td>
 <td class="content">In Metalink, BitTorrent download you cannot specify file name.
 The file name specified here is only used when the URLs fed to aria2
-is done by command line without <strong>-i</strong>, <strong>-Z</strong> option, like this:
+is done by command line without <strong>-i</strong>, <strong>-Z</strong> option. For example:
 aria2c -o myfile.zip <a href="http://mirror1/file.zip">http://mirror1/file.zip</a> <a href="http://mirror2/file.zip">http://mirror2/file.zip</a></td>
 </tr></table>
 </div>
 <div class="vlist"><dl>
 <dt>
+<strong>--proxy-method</strong>=METHOD
+</dt>
+<dd>
+<p>
+  Set the method to use in proxy request.
+  <em>METHOD</em> is either <em>get</em> or <em>tunnel</em>.
+  Default: <em>tunnel</em>
+</p>
+</dd>
+<dt>
 <strong>-R</strong>, <strong>--remote-time</strong>[=<em>true</em>|<em>false</em>]
 </dt>
 <dd>
@@ -1994,7 +1994,7 @@ files in the program, then also delete it here.</p></div>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2008-11-11 20:52:35 JST
+Last updated 2008-11-14 00:10:16 JST
 </div>
 </div>
 </body>

doc/aria2c.1.txt

@@ -100,17 +100,17 @@ HTTP/FTP Options
 *-o*, *--out*=FILE::
   The file name of the downloaded file.
 
-*--proxy-method*=METHOD::
-  Set the method to use in proxy request.
-  'METHOD' is either 'get' or 'tunnel'.
-  Default: 'tunnel'
-
 [NOTE]
 In Metalink, BitTorrent download you cannot specify file name.
 The file name specified here is only used when the URLs fed to aria2
-is done by command line without *-i*, *-Z* option, like this:
+is done by command line without *-i*, *-Z* option. For example:
 aria2c -o myfile.zip http://mirror1/file.zip http://mirror2/file.zip
 
+*--proxy-method*=METHOD::
+  Set the method to use in proxy request.
+  'METHOD' is either 'get' or 'tunnel'.
+  Default: 'tunnel'
+
 *-R*, *--remote-time*[='true'|'false']::
   Retrieve timestamp of the remote file from the remote HTTP/FTP
   server and if it is available, apply it to the local file.