2010-08-25 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Documented --bt-tracker and --bt-exclude-tracker option in man
	page.
	* doc/aria2c.1.txt

4 files changed, 99 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 610b1eb1..257bc34d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-08-25  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
+	Documented --bt-tracker and --bt-exclude-tracker option in man
+	page.
+	* doc/aria2c.1.txt
+
+2010-08-25  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
 	Set max outstanding request size to 100. Set stepping to 6.
 	* src/BtConstants.h
 	* src/DefaultBtInteractive.cc
diff --git a/doc/aria2c.1 b/doc/aria2c.1
index dbdc1f34..f191b478 100644
--- a/doc/aria2c.1
+++ b/doc/aria2c.1
@@ -620,6 +620,13 @@ is given\&. Default:
 \fIfalse\fR
 .RE
 .PP
+\fB\-\-bt\-exclude\-tracker\fR=URI[,\&...]
+.RS 4
+Comma separated list of BitTorrent tracker\(cqs announce URI to remove\&. You can use special value "*" which matches all URIs, thus removes all announce URIs\&. When specifying "*" in shell command\-line, don\(cqt forget to escape or quote it\&. See also
+\fB\-\-bt\-tracker\fR
+option\&.
+.RE
+.PP
 \fB\-\-bt\-external\-ip\fR=IPADDRESS
 .RS 4
 Specify the external IP address to report to a BitTorrent tracker\&. Although this function is named "external", it can accept any kind of IP addresses\&. IPADDRESS must be a numeric IP address\&.
@@ -721,6 +728,15 @@ is given, this feature is disabled\&. Default:
 \fI0\fR
 .RE
 .PP
+\fB\-\-bt\-tracker\fR=URI[,\&...]
+.RS 4
+Comma separated list of additional BitTorrent tracker\(cqs announce URI\&. These URIs are not affected by
+\fB\-\-bt\-exclude\-tracker\fR
+option because they are added after URIs in
+\fB\-\-bt\-exclude\-tracker\fR
+option are removed\&.
+.RE
+.PP
 \fB\-\-bt\-tracker\-connect\-timeout\fR=SEC
 .RS 4
 Set the connect timeout in seconds to establish connection to tracker\&. After the connection is established, this option makes no effect and
@@ -3954,6 +3970,27 @@ If aria2c is not built with c\-ares, \fB\-\-enable\-async\-dns6\fR is unnecessar
 .sp .5v
 .RE
 .RE
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBAdd and remove tracker URI\fR
+.RS 4
+.sp
+Removes all tracker announce URIs described in file\&.torrent and use http://tracker1/announce and http://tracker2/announce instead\&.
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+aria2c \-\-bt\-exclude\-tracker="*" \-\-bt\-tracker="http://tracker1/announce,http://tracker2/announce" file\&.torrent
+.fi
+.if n \{\
+.RE
+.\}
+.RE
 .SS "More advanced HTTP features"
 .sp
 .it 1 an-trap
diff --git a/doc/aria2c.1.html b/doc/aria2c.1.html
index 4bce631c..49727bbf 100644
--- a/doc/aria2c.1.html
+++ b/doc/aria2c.1.html
@@ -1321,6 +1321,18 @@ writes the piece to the appropriate files.</td>
 </p>

 </dd>

 <dt class="hdlist1">

+<strong>--bt-exclude-tracker</strong>=URI[,&#8230;]

+</dt>

+<dd>

+<p>

+  Comma separated list of BitTorrent tracker&#8217;s announce URI to

+  remove. You can use special value "*" which matches all URIs, thus

+  removes all announce URIs. When specifying "*" in shell

+  command-line, don&#8217;t forget to escape or quote it.  See also

+  <strong>--bt-tracker</strong> option.

+</p>

+</dd>

+<dt class="hdlist1">

 <strong>--bt-external-ip</strong>=IPADDRESS

 </dt>

 <dd>

@@ -1464,6 +1476,17 @@ writes the piece to the appropriate files.</td>
 </p>

 </dd>

 <dt class="hdlist1">

+<strong>--bt-tracker</strong>=URI[,&#8230;]

+</dt>

+<dd>

+<p>

+  Comma separated list of additional BitTorrent tracker&#8217;s announce

+  URI. These URIs are not affected by <strong>--bt-exclude-tracker</strong> option

+  because they are added after URIs in <strong>--bt-exclude-tracker</strong> option are

+  removed.

+</p>

+</dd>

+<dt class="hdlist1">

 <strong>--bt-tracker-connect-timeout</strong>=SEC

 </dt>

 <dd>

@@ -4187,6 +4210,13 @@ forwarding, it&#8217;s up to you to do it manually.</td>
 unnecessary. aria2 shares same port between IPv4 and IPv6 DHT.</td>

 </tr></table>

 </div>

+<h4 id="_add_and_remove_tracker_uri">Add and remove tracker URI</h4>

+<div class="paragraph"><p>Removes all tracker announce URIs described in file.torrent and use

+<a href="http://tracker1/announce">http://tracker1/announce</a> and <a href="http://tracker2/announce">http://tracker2/announce</a> instead.</p></div>

+<div class="listingblock">

+<div class="content">

+<pre><tt>aria2c --bt-exclude-tracker="*" --bt-tracker="http://tracker1/announce,http://tracker2/announce" file.torrent</tt></pre>

+</div></div>

 <h3 id="_more_advanced_http_features">More advanced HTTP features</h3><div style="clear:left"></div>

 <h4 id="_load_cookies">Load cookies</h4>

 <div class="listingblock">

@@ -4324,7 +4354,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-08-25 21:36:04 JST

+Last updated 2010-08-25 23:19:41 JST

 </div>

 </div>

 </body>

diff --git a/doc/aria2c.1.txt b/doc/aria2c.1.txt
index 969208e1..06a51a8f 100644
--- a/doc/aria2c.1.txt
+++ b/doc/aria2c.1.txt
@@ -425,6 +425,14 @@ BitTorrent Specific Options
   aria2 doesn't use this feature for that download even if 'true' is
   given.  Default: 'false'
 
+*--bt-exclude-tracker*=URI[,...]::
+
+  Comma separated list of BitTorrent tracker's announce URI to
+  remove. You can use special value "\*" which matches all URIs, thus
+  removes all announce URIs. When specifying "\*" in shell
+  command-line, don't forget to escape or quote it.  See also
+  *--bt-tracker* option.
+
 *--bt-external-ip*=IPADDRESS::
   Specify the external IP address to report to a BitTorrent
   tracker. Although this function is named "external", it can accept
@@ -508,6 +516,13 @@ BitTorrent Specific Options
   Stop BitTorrent download if download speed is 0 in consecutive SEC
   seconds. If '0' is given, this feature is disabled.  Default: '0'
 
+*--bt-tracker*=URI[,...]::
+
+  Comma separated list of additional BitTorrent tracker's announce
+  URI. These URIs are not affected by *--bt-exclude-tracker* option
+  because they are added after URIs in *--bt-exclude-tracker* option are
+  removed.
+
 *--bt-tracker-connect-timeout*=SEC::
 
   Set the connect timeout in seconds to establish connection to
@@ -2207,6 +2222,16 @@ aria2c --enable-dht6 --dht-listen-port=6881 --dht-listen-addr6=YOUR_GLOBAL_UNICA
 If aria2c is not built with c-ares, *--enable-async-dns6* is
 unnecessary. aria2 shares same port between IPv4 and IPv6 DHT.
 
+Add and remove tracker URI
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Removes all tracker announce URIs described in file.torrent and use
+http://tracker1/announce and http://tracker2/announce instead.
+
+---------------------------------------------------------------------------------------------------------
+aria2c --bt-exclude-tracker="*" --bt-tracker="http://tracker1/announce,http://tracker2/announce" file.torrent
+---------------------------------------------------------------------------------------------------------
+
 More advanced HTTP features
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Load cookies