2009-07-05 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Updated man page regarding multi-file torrent web-seeding.
	* doc/aria2c.1.txt

ChangeLog

@@ -1,3 +1,8 @@
+2009-07-05  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Updated man page regarding multi-file torrent web-seeding.
+	* doc/aria2c.1.txt
+
 2009-07-05  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Updated doc

doc/aria2c.1

@@ -2,12 +2,12 @@
 .\"     Title: aria2c
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.0 <http://docbook.sf.net/>
-.\"      Date: 06/14/2009
+.\"      Date: 07/05/2009
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "ARIA2C" "1" "06/14/2009" "[FIXME: source]" "[FIXME: manual]"
+.TH "ARIA2C" "1" "07/05/2009" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -1060,7 +1060,7 @@ You can specify multiple URLs in command\-line\&. Unless you specify \fB\-Z\fR o
 .sp
 You can also specify arbitrary number of torrent files and metalink files stored on a local drive\&. Please note that they are always treated as a separate download\&.
 .sp
-You can specify both torrent file with \-T option and URLs\&. By doing this, you can download a file from both torrent swarm and HTTP(S)/FTP server at the same time, while the data from HTTP(S)/FTP are uploaded to the torrent swarm\&. Note that only single file torrent can be integrated with HTTP(S)/FTP\&.
+You can specify both torrent file with \-T option and URLs\&. By doing this, you can download a file from both torrent swarm and HTTP(S)/FTP server at the same time, while the data from HTTP(S)/FTP are uploaded to the torrent swarm\&. For single file torrents, URL can be a complete URL pointing to the resource or if URL ends with /, name in torrent file in torrent is added\&. For multi\-file torrents, name and path are added to form a URL for each file\&.
 .if n \{\
 .sp
 .\}
@@ -2063,7 +2063,7 @@ This method adds new HTTP(S)/FTP download\&. \fIuris\fR is of type array and its
 .sp
 \fBaria2\&.addTorrent\fR \fItorrent[, uris[, options[, position]]]\fR
 .sp
-This method adds BitTorrent download by uploading \&.torrent file\&. \fItorrent\fR is of type base64 which contains Base64\-encoded \&.torrent file\&. \fIuris\fR is of type array and its element is URI which is of type string\&. \fIuris\fR is used for Web\-seeding\&. Note that \fIuris\fR is ignored if specified torrent is a multi\-file torrent\&. \fIoptions\fR is of type struct and its members are a pair of option name and value\&. See \fBOptions\fR below for more details\&. If \fIposition\fR is given as an integer starting from 0, the new download is inserted at \fIposition\fR in the waiting queue\&. If \fIposition\fR is not given or \fIposition\fR is larger than the size of the queue, it is appended at the end of the queue\&. This method returns GID of registered download\&.
+This method adds BitTorrent download by uploading \&.torrent file\&. \fItorrent\fR is of type base64 which contains Base64\-encoded \&.torrent file\&. \fIuris\fR is of type array and its element is URI which is of type string\&. \fIuris\fR is used for Web\-seeding\&. For single file torrents, URI can be a complete URI pointing to the resource or if URI ends with /, name in torrent file is added\&. For multi\-file torrents, name and path in torrent are added to form a URI for each file\&. \fIoptions\fR is of type struct and its members are a pair of option name and value\&. See \fBOptions\fR below for more details\&. If \fIposition\fR is given as an integer starting from 0, the new download is inserted at \fIposition\fR in the waiting queue\&. If \fIposition\fR is not given or \fIposition\fR is larger than the size of the queue, it is appended at the end of the queue\&. This method returns GID of registered download\&.
 .sp
 \fBaria2\&.addMetalink\fR \fImetalink[, options[, position]]\fR
 .sp

doc/aria2c.1.html

@@ -1738,10 +1738,13 @@ Unless you specify <strong>-Z</strong> option, all URLs must point to the same f
 <div class="paragraph"><p>You can also specify arbitrary number of torrent files and metalink files
 stored on a local drive. Please note that they are always treated as a
 separate download.</p></div>
-<div class="paragraph"><p>You can specify both torrent file with -T option and URLs. By doing this,
-you can download a file from both torrent swarm and HTTP(S)/FTP server at the same time,
-while the data from HTTP(S)/FTP are uploaded to the torrent swarm. Note that
-only single file torrent can be integrated with HTTP(S)/FTP.</p></div>
+<div class="paragraph"><p>You can specify both torrent file with -T option and URLs. By doing
+this, you can download a file from both torrent swarm and HTTP(S)/FTP
+server at the same time, while the data from HTTP(S)/FTP are uploaded
+to the torrent swarm.  For single file torrents, URL can be a complete
+URL pointing to the resource or if URL ends with /, name in torrent
+file in torrent is added. For multi-file torrents, name and path are
+added to form a URL for each file.</p></div>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
@@ -2428,9 +2431,11 @@ registered download.</p></div>
 <div class="paragraph"><p>This method adds BitTorrent download by uploading .torrent file.
 <em>torrent</em> is of type base64 which contains Base64-encoded .torrent
 file.  <em>uris</em> is of type array and its element is URI which is of type
-string. <em>uris</em> is used for Web-seeding. Note that <em>uris</em> is ignored if
-specified torrent is a multi-file torrent.  <em>options</em> is of type
-struct and its members are a pair of option name and value. See
+string. <em>uris</em> is used for Web-seeding.  For single file torrents, URI
+can be a complete URI pointing to the resource or if URI ends with /,
+name in torrent file is added. For multi-file torrents, name and path
+in torrent are added to form a URI for each file.  <em>options</em> is of
+type struct and its members are a pair of option name and value. See
 <strong>Options</strong> below for more details.  If <em>position</em> is given as an
 integer starting from 0, the new download is inserted at <em>position</em> in
 the waiting queue. If <em>position</em> is not given or <em>position</em> is larger
@@ -3173,7 +3178,7 @@ files in the program, then also delete it here.</p></div>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-06-14 16:20:17 JST
+Last updated 2009-07-05 14:19:43 JST
 </div>
 </div>
 </body>

doc/aria2c.1.txt

@@ -728,10 +728,13 @@ You can also specify arbitrary number of torrent files and metalink files
 stored on a local drive. Please note that they are always treated as a
 separate download.
 
-You can specify both torrent file with -T option and URLs. By doing this,
-you can download a file from both torrent swarm and HTTP(S)/FTP server at the same time,
-while the data from HTTP(S)/FTP are uploaded to the torrent swarm. Note that
-only single file torrent can be integrated with HTTP(S)/FTP.
+You can specify both torrent file with -T option and URLs. By doing
+this, you can download a file from both torrent swarm and HTTP(S)/FTP
+server at the same time, while the data from HTTP(S)/FTP are uploaded
+to the torrent swarm.  For single file torrents, URL can be a complete
+URL pointing to the resource or if URL ends with /, name in torrent
+file in torrent is added. For multi-file torrents, name and path are
+added to form a URL for each file.
 
 [NOTE]
 Make sure that URL is quoted with single(') or double(") quotation if it
@@ -1055,9 +1058,11 @@ registered download.
 This method adds BitTorrent download by uploading .torrent file.
 'torrent' is of type base64 which contains Base64-encoded .torrent
 file.  'uris' is of type array and its element is URI which is of type
-string. 'uris' is used for Web-seeding. Note that 'uris' is ignored if
-specified torrent is a multi-file torrent.  'options' is of type
-struct and its members are a pair of option name and value. See
+string. 'uris' is used for Web-seeding.  For single file torrents, URI
+can be a complete URI pointing to the resource or if URI ends with /,
+name in torrent file is added. For multi-file torrents, name and path
+in torrent are added to form a URI for each file.  'options' is of
+type struct and its members are a pair of option name and value. See
 *Options* below for more details.  If 'position' is given as an
 integer starting from 0, the new download is inserted at 'position' in
 the waiting queue. If 'position' is not given or 'position' is larger