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

	Moved -x and -k option to HTTP/FTP option.
	* doc/aria2c.1.txt

ChangeLog

@@ -1,3 +1,8 @@
+2010-10-30  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Moved -x and -k option to HTTP/FTP option.
+	* doc/aria2c.1.txt
+
 2010-10-30  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Tagged -x and -k option as #basic

doc/aria2c.1

@@ -174,6 +174,12 @@ or
 \fI0\fR
 .RE
 .PP
+\fB\-x\fR, \fB\-\-max\-connection\-per\-server\fR=NUM
+.RS 4
+The maximum number of connections to one server for each download\&. Default:
+\fI1\fR
+.RE
+.PP
 \fB\-\-max\-file\-not\-found\fR=NUM
 .RS 4
 If aria2 receives \(oqfile not found\(cq status from the remote HTTP/FTP servers NUM times without getting a single byte, then force the download to fail\&. Specify
@@ -190,6 +196,19 @@ means unlimited\&. Default:
 \fI5\fR
 .RE
 .PP
+\fB\-k\fR, \fB\-\-min\-split\-size\fR=SIZE
+.RS 4
+aria2 does not split less than 2*SIZE byte range\&. For example, let\(cqs consider downloading 20MiB file\&. If SIZE is 10M, aria2 can split file into 2 range [0\-10MiB) and [10MiB\-20MiB) and download it using 2 sources(if
+\fB\-\-split\fR
+>= 2, of course)\&. If SIZE is 15M, since 2*15M > 20MiB, aria2 does not split file and download it using 1 source\&. You can append
+\fIK\fR
+or
+\fIM\fR(1K = 1024, 1M = 1024K)\&. Possible Values:
+\fI1M\fR\-\fI1024M\fR
+Default:
+\fI20M\fR
+.RE
+.PP
 \fB\-n\fR, \fB\-\-no\-netrc\fR
 .RS 4
 Disables netrc support\&. netrc support is enabled by default\&.
@@ -1266,12 +1285,6 @@ If an interface has multiple addresses, it is highly recommended to specify IP a
 .sp .5v
 .RE
 .PP
-\fB\-x\fR, \fB\-\-max\-connection\-per\-server\fR=NUM
-.RS 4
-The maximum number of connections to one server for each download\&. Default:
-\fI1\fR
-.RE
-.PP
 \fB\-\-max\-download\-result\fR=NUM
 .RS 4
 Set maximum number of download result kept in memory\&. The download results are completed/error/removed downloads\&. The download results are stored in FIFO queue and it can store at most NUM download results\&. When queue is full and new download result is created, oldest download result is removed from the front of the queue and new one is pushed to the back\&. Setting big number in this option may result high memory consumption after thousands of downloads\&. Specifying 0 means no download result is kept\&. Default:
@@ -1292,19 +1305,6 @@ option\&. Default:
 \fI0\fR
 .RE
 .PP
-\fB\-k\fR, \fB\-\-min\-split\-size\fR=SIZE
-.RS 4
-aria2 does not split less than 2*SIZE byte range\&. For example, let\(cqs consider downloading 20MiB file\&. If SIZE is 10M, aria2 can split file into 2 range [0\-10MiB) and [10MiB\-20MiB) and download it using 2 sources(if
-\fB\-\-split\fR
->= 2, of course)\&. If SIZE is 15M, since 2*15M > 20MiB, aria2 does not split file and download it using 1 source\&. You can append
-\fIK\fR
-or
-\fIM\fR(1K = 1024, 1M = 1024K)\&. Possible Values:
-\fI1M\fR\-\fI1024M\fR
-Default:
-\fI20M\fR
-.RE
-.PP
 \fB\-\-log\-level\fR=LEVEL
 .RS 4
 Set log level to output\&. LEVEL is either

doc/aria2c.1.html

@@ -775,6 +775,15 @@ then you get HTTP proxy "http://proxy" with user "user" and password
 </p>
 </dd>
 <dt class="hdlist1">
+<strong>-x</strong>, <strong>--max-connection-per-server</strong>=NUM
+</dt>
+<dd>
+<p>
+  The maximum number of connections to one server for each download.
+  Default: <em>1</em>
+</p>
+</dd>
+<dt class="hdlist1">
 <strong>--max-file-not-found</strong>=NUM
 </dt>
 <dd>
@@ -796,6 +805,20 @@ then you get HTTP proxy "http://proxy" with user "user" and password
 </p>
 </dd>
 <dt class="hdlist1">
+<strong>-k</strong>, <strong>--min-split-size</strong>=SIZE
+</dt>
+<dd>
+<p>
+  aria2 does not split less than 2*SIZE byte range.  For example,
+  let&#8217;s consider downloading 20MiB file. If SIZE is 10M, aria2 can
+  split file into 2 range [0-10MiB) and [10MiB-20MiB) and download it
+  using 2 sources(if <strong>--split</strong> &gt;= 2, of course).  If SIZE is 15M,
+  since 2*15M &gt; 20MiB, aria2 does not split file and download it using
+  1 source.  You can append <em>K</em> or <em>M</em>(1K = 1024, 1M = 1024K).
+  Possible Values: <em>1M</em>-<em>1024M</em> Default: <em>20M</em>
+</p>
+</dd>
+<dt class="hdlist1">
 <strong>-n</strong>, <strong>--no-netrc</strong>
 </dt>
 <dd>
@@ -2124,15 +2147,6 @@ name.</td>
 </div>
 <div class="dlist"><dl>
 <dt class="hdlist1">
-<strong>-x</strong>, <strong>--max-connection-per-server</strong>=NUM
-</dt>
-<dd>
-<p>
-  The maximum number of connections to one server for each download.
-  Default: <em>1</em>
-</p>
-</dd>
-<dt class="hdlist1">
 <strong>--max-download-result</strong>=NUM
 </dt>
 <dd>
@@ -2161,20 +2175,6 @@ name.</td>
 </p>
 </dd>
 <dt class="hdlist1">
-<strong>-k</strong>, <strong>--min-split-size</strong>=SIZE
-</dt>
-<dd>
-<p>
-  aria2 does not split less than 2*SIZE byte range.  For example,
-  let&#8217;s consider downloading 20MiB file. If SIZE is 10M, aria2 can
-  split file into 2 range [0-10MiB) and [10MiB-20MiB) and download it
-  using 2 sources(if <strong>--split</strong> &gt;= 2, of course).  If SIZE is 15M,
-  since 2*15M &gt; 20MiB, aria2 does not split file and download it using
-  1 source.  You can append <em>K</em> or <em>M</em>(1K = 1024, 1M = 1024K).
-  Possible Values: <em>1M</em>-<em>1024M</em> Default: <em>20M</em>
-</p>
-</dd>
-<dt class="hdlist1">
 <strong>--log-level</strong>=LEVEL
 </dt>
 <dd>
@@ -4550,7 +4550,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-10-30 13:13:28 JST
+Last updated 2010-10-30 13:18:27 JST
 </div>
 </div>
 </body>

doc/aria2c.1.txt

@@ -134,6 +134,11 @@ then you get HTTP proxy "http://proxy" with user "user" and password
   This option does not affect BitTorrent downloads.
   Default: '0'
 
+*-x*, *--max-connection-per-server*=NUM::
+
+  The maximum number of connections to one server for each download.
+  Default: '1'
+
 *--max-file-not-found*=NUM::
   If aria2 receives `file not found' status from the remote HTTP/FTP
   servers NUM times without getting a single byte, then force the
@@ -145,6 +150,16 @@ then you get HTTP proxy "http://proxy" with user "user" and password
   Set number of tries. '0' means unlimited.
   Default: '5'
 
+*-k*, *--min-split-size*=SIZE::
+
+  aria2 does not split less than 2*SIZE byte range.  For example,
+  let's consider downloading 20MiB file. If SIZE is 10M, aria2 can
+  split file into 2 range [0-10MiB) and [10MiB-20MiB) and download it
+  using 2 sources(if *--split* >= 2, of course).  If SIZE is 15M,
+  since 2*15M > 20MiB, aria2 does not split file and download it using
+  1 source.  You can append 'K' or 'M'(1K = 1024, 1M = 1024K).
+  Possible Values: '1M'-'1024M' Default: '20M'
+
 *-n*, *--no-netrc*::
   Disables netrc support. netrc support is enabled by default.
 
@@ -880,12 +895,6 @@ specify IP address explicitly. See also *--disable-ipv6*.  If your
 system doesn't have getifaddrs(), this option doesn't accept interface
 name.
 
-*-x*, *--max-connection-per-server*=NUM::
-
-  The maximum number of connections to one server for each download.
-  Default: '1'
-
-
 *--max-download-result*=NUM::
 
   Set maximum number of download result kept in memory. The download
@@ -906,16 +915,6 @@ name.
   given URIs do not support resume.  See *--always-resume* option.
   Default: '0'
 
-*-k*, *--min-split-size*=SIZE::
-
-  aria2 does not split less than 2*SIZE byte range.  For example,
-  let's consider downloading 20MiB file. If SIZE is 10M, aria2 can
-  split file into 2 range [0-10MiB) and [10MiB-20MiB) and download it
-  using 2 sources(if *--split* >= 2, of course).  If SIZE is 15M,
-  since 2*15M > 20MiB, aria2 does not split file and download it using
-  1 source.  You can append 'K' or 'M'(1K = 1024, 1M = 1024K).
-  Possible Values: '1M'-'1024M' Default: '20M'
-
 *--log-level*=LEVEL::
   Set log level to output.
   LEVEL is either 'debug', 'info', 'notice', 'warn' or 'error'.