From eb27476c6eb54994b74307a9df2f2557ecc12f2b Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Tue, 11 Nov 2008 11:55:23 +0000 Subject: [PATCH] 2008-11-11 Tatsuhiro Tsujikawa Cross referenced among -s, -C and -j options. Updated usage of -C and -s options. * src/usage_text.h * doc/aria2c.1.txt --- ChangeLog | 7 +++++++ doc/aria2c.1 | 20 +++++++++++++++----- doc/aria2c.1.html | 14 ++++++++++---- doc/aria2c.1.txt | 12 +++++++++--- src/usage_text.h | 15 ++++++++++++--- 5 files changed, 53 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39f42a1a..9f286c9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-11-11 Tatsuhiro Tsujikawa + + Cross referenced among -s, -C and -j options. + Updated usage of -C and -s options. + * src/usage_text.h + * doc/aria2c.1.txt + 2008-11-11 Tatsuhiro Tsujikawa Fixed bad cast in 32bit platforms. diff --git a/doc/aria2c.1 b/doc/aria2c.1 index 229fd15c..2cfe841e 100644 --- a/doc/aria2c.1 +++ b/doc/aria2c.1 @@ -1,11 +1,11 @@ .\" Title: aria2c .\" Author: .\" Generator: DocBook XSL Stylesheets v1.73.2 -.\" Date: 11/09/2008 +.\" Date: 11/11/2008 .\" Manual: .\" Source: .\" -.TH "ARIA2C" "1" "11/09/2008" "" "" +.TH "ARIA2C" "1" "11/11/2008" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -42,7 +42,11 @@ is specified, log is written to stdout\&. .PP \fB\-j\fR, \fB\-\-max\-concurrent\-downloads\fR=N .RS 4 -Set maximum number of parallel downloads for every static (HTTP/FTP) URL, torrent and metalink\&. Default: +Set maximum number of parallel downloads for every static (HTTP/FTP) URL, torrent and metalink\&. See also +\fB\-s\fR +and +\fB\-C\fR +option\&. Default: \fI5\fR .RE .PP @@ -189,7 +193,9 @@ Download a file using N connections\&. If more than N URLs are given, first N UR and \fI16\fR\&. Please see \fB\-j\fR -option too\&. Default: +option too\&. Please note that in Metalink download, this option has no effect and use +\fB\-C\fR +option instead\&. Default: \fI5\fR .RE .PP @@ -556,7 +562,11 @@ The file path to \&.metalink file\&. You may not use this option because you can .PP \fB\-C\fR, \fB\-\-metalink\-servers\fR=NUM_SERVERS .RS 4 -The number of servers to connect to simultaneously\&. Some metalinks regulates the number of servers to connect\&. aria2 respects them\&. Default: +The number of servers to connect to simultaneously\&. Some Metalinks regulates the number of servers to connect\&. aria2 strictly respects them\&. This means that if Metalink defines the maxconnections attribute lower than NUM_SERVERS, then aria2 uses the value of maxconnections attribute instead of NUM_SERVERS\&. See also +\fB\-s\fR +and +\fB\-j\fR +options\&. Default: \fI5\fR .RE .PP diff --git a/doc/aria2c.1.html b/doc/aria2c.1.html index 66865425..27d67b69 100644 --- a/doc/aria2c.1.html +++ b/doc/aria2c.1.html @@ -416,7 +416,7 @@ ARIA2C(1) Manual Page

Set maximum number of parallel downloads for every static (HTTP/FTP) URL, - torrent and metalink. + torrent and metalink. See also -s and -C option. Default: 5

@@ -620,6 +620,8 @@ aria2c -o myfile.zip http://mirror1/file.zip1 and 16. Please see -j option too. + Please note that in Metalink download, this option has no effect and use + -C option instead. Default: 5

@@ -1140,8 +1142,12 @@ writes the piece to the appropriate files.

The number of servers to connect to simultaneously. - Some metalinks regulates the number of servers to connect. - aria2 respects them. + Some Metalinks regulates the number of servers to connect. + aria2 strictly respects them. + This means that if Metalink defines the maxconnections attribute lower + than NUM_SERVERS, then aria2 uses the value of maxconnections attribute + instead of NUM_SERVERS. + See also -s and -j options. Default: 5

@@ -1988,7 +1994,7 @@ files in the program, then also delete it here.

diff --git a/doc/aria2c.1.txt b/doc/aria2c.1.txt index 75a44524..5f5adb4e 100644 --- a/doc/aria2c.1.txt +++ b/doc/aria2c.1.txt @@ -33,7 +33,7 @@ Basic Options *-j*, *--max-concurrent-downloads*=N:: Set maximum number of parallel downloads for every static (HTTP/FTP) URL, - torrent and metalink. + torrent and metalink. See also *-s* and *-C* option. Default: '5' *--check-integrity*='true'|'false':: @@ -144,6 +144,8 @@ aria2c -o myfile.zip http://mirror1/file.zip http://mirror2/file.zip If less than N URLs are given, those URLs are used more than once so that N connections total are made simultaneously. N must be between '1' and '16'. Please see *-j* option too. + Please note that in Metalink download, this option has no effect and use + *-C* option instead. Default: '5' *-t*, *--timeout*=SEC:: @@ -403,8 +405,12 @@ Metalink Specific Options *-C*, *--metalink-servers*=NUM_SERVERS:: The number of servers to connect to simultaneously. - Some metalinks regulates the number of servers to connect. - aria2 respects them. + Some Metalinks regulates the number of servers to connect. + aria2 strictly respects them. + This means that if Metalink defines the maxconnections attribute lower + than NUM_SERVERS, then aria2 uses the value of maxconnections attribute + instead of NUM_SERVERS. + See also *-s* and *-j* options. Default: '5' *--metalink-language*=LANGUAGE:: diff --git a/src/usage_text.h b/src/usage_text.h index 11d9b7cf..eb021269 100644 --- a/src/usage_text.h +++ b/src/usage_text.h @@ -48,7 +48,9 @@ _(" -s, --split=N Download a file using N connections. If more\n" " remaining URLs are used for backup. If less than\n"\ " N URLs are given, those URLs are used more than\n"\ " once so that N connections total are made\n"\ - " simultaneously. Please see -j option too.") + " simultaneously. Please see -j option too.\n"\ + " Please note that in Metalink download, this\n"\ + " option has no effect and use -C option instead.") #define TEXT_RETRY_WAIT \ _(" --retry-wait=SEC Set the seconds to wait to retry after an error\n"\ " has occured.") @@ -180,7 +182,8 @@ _(" -i, --input-file=FILE Downloads URIs found in FILE. You can specify\n " Reads input from stdin when '-' is specified.") #define TEXT_MAX_CONCURRENT_DOWNLOADS \ _(" -j, --max-concurrent-downloads=N Set maximum number of parallel downloads for\n"\ - " every static (HTTP/FTP) URL, torrent and metalink.") + " every static (HTTP/FTP) URL, torrent and metalink.\n"\ + " See also -s and -C options.") #define TEXT_LOAD_COOKIES \ _(" --load-cookies=FILE Load Cookies from FILE using the Firefox3 format\n"\ " and Mozilla/Firefox(1.x/2.x)/Netscape format.") @@ -280,7 +283,13 @@ _(" --bt-seed-unverified[=true|false] Seed previously downloaded files without\n _(" -M, --metalink-file=METALINK_FILE The file path to the .metalink file.") #define TEXT_METALINK_SERVERS \ _(" -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n"\ - " simultaneously.") + " simultaneously. Some Metalinks regulates the\n"\ + " number of servers to connect. aria2 strictly\n"\ + " respects them. This means that if Metalink defines\n"\ + " the maxconnections attribute lower than\n"\ + " NUM_SERVERS, then aria2 uses the value of\n"\ + " maxconnections attribute instead of NUM_SERVERS.\n"\ + " See also -s and -j options.") #define TEXT_METALINK_VERSION \ _(" --metalink-version=VERSION The version of the file to download.") #define TEXT_METALINK_LANGUAGE \