From 492d6e9694e70abe5e6bef7b94f84c121cb11562 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Tue, 31 Aug 2010 11:55:16 +0000 Subject: [PATCH] 2010-08-31 Tatsuhiro Tsujikawa Updated doc * doc/aria2c.1.txt --- ChangeLog | 5 +++++ doc/aria2c.1 | 23 ++++++++++++++++++++--- doc/aria2c.1.html | 20 ++++++++++++++++++-- doc/aria2c.1.txt | 24 +++++++++++++++++++++++- 4 files changed, 66 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index aaa90a3c..cd5a5c7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-08-31 Tatsuhiro Tsujikawa + + Updated doc + * doc/aria2c.1.txt + 2010-08-31 Tatsuhiro Tsujikawa Added test for previous change diff --git a/doc/aria2c.1 b/doc/aria2c.1 index 11029d91..9fe73e99 100644 --- a/doc/aria2c.1 +++ b/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.2 -.\" Date: 08/27/2010 +.\" Date: 08/31/2010 .\" Manual: Aria2 Manual .\" Source: Aria2 1.10.1 .\" Language: English .\" -.TH "ARIA2C" "1" "08/27/2010" "Aria2 1\&.10\&.1" "Aria2 Manual" +.TH "ARIA2C" "1" "08/31/2010" "Aria2 1\&.10\&.1" "Aria2 Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1654,7 +1654,24 @@ ftp\-pasv=true .\} .SS "dht\&.dat" .sp -By default, the routing table of DHT is saved to the path $HOME/\&.aria2/dht\&.dat\&. +By default, the routing table of IPv4 DHT is saved to the path $HOME/\&.aria2/dht\&.dat and the routing table of IPv6 DHT is saved to the path $HOME/\&.aria2/dht6\&.dat\&. +.SS "Netrc" +.sp +Netrc support is enabled by default for HTTP(S)/FTP\&. To disable netrc support, specify \fB\-n\fR option\&. Your \&.netrc file should have correct permissions(600)\&. +.sp +If machine name starts "\&.", aria2 performs domain match instead of exact match\&. This is an extension of aria2\&. For example of domain match, imagine the following \&.netrc entry: +.sp +.if n \{\ +.RS 4 +.\} +.nf +machine \&.example\&.org login myid password mypasswd +.fi +.if n \{\ +.RE +.\} +.sp +In domain match, aria2\&.example\&.org matches \&.example\&.org and uses myid and mypasswd\&. example\&.org also matches \&.example\&.org\&. But example\&.net does not match \&.example\&.org\&. .SS "Control File" .sp aria2 uses a control file to track the progress of a download\&. A control file is placed in the same directory as the downloading file and its filename is the filename of downloading file with "\&.aria2" appended\&. For example, if you are downloading file\&.zip, then the control file should be file\&.zip\&.aria2\&. (There is a exception for this naming convention\&. If you are downloading a multi torrent, its control file is the "top directory" name of the torrent with "\&.aria2" appended\&. The "top directory" name is a value of "name" key in "info" directory in a torrent file\&.) diff --git a/doc/aria2c.1.html b/doc/aria2c.1.html index d1f2a333..518519b4 100644 --- a/doc/aria2c.1.html +++ b/doc/aria2c.1.html @@ -2594,7 +2594,23 @@ max-upload-limit=50K ftp-pasv=true

dht.dat

-

By default, the routing table of DHT is saved to the path $HOME/.aria2/dht.dat.

+

By default, the routing table of IPv4 DHT is saved to the path +$HOME/.aria2/dht.dat and the routing table of IPv6 DHT is saved to the +path $HOME/.aria2/dht6.dat.

+

Netrc

+

Netrc support is enabled by default for HTTP(S)/FTP. To disable netrc +support, specify -n option. Your .netrc file should have correct +permissions(600).

+

If machine name starts ".", aria2 performs domain match instead of +exact match. This is an extension of aria2. For example of domain +match, imagine the following .netrc entry:

+
+
+
machine .example.org login myid password mypasswd
+
+

In domain match, aria2.example.org matches .example.org and uses myid +and mypasswd. example.org also matches .example.org. But example.net +does not match .example.org.

Control File

aria2 uses a control file to track the progress of a download. A control file is placed in the same directory as the downloading file @@ -4364,7 +4380,7 @@ files in the program, then also delete it here.

diff --git a/doc/aria2c.1.txt b/doc/aria2c.1.txt index f3fa7bce..cf119caa 100644 --- a/doc/aria2c.1.txt +++ b/doc/aria2c.1.txt @@ -1178,7 +1178,29 @@ ftp-pasv=true dht.dat ~~~~~~~~ -By default, the routing table of DHT is saved to the path $HOME/.aria2/dht.dat. + +By default, the routing table of IPv4 DHT is saved to the path +$HOME/.aria2/dht.dat and the routing table of IPv6 DHT is saved to the +path $HOME/.aria2/dht6.dat. + +Netrc +~~~~~ + +Netrc support is enabled by default for HTTP(S)/FTP. To disable netrc +support, specify *-n* option. Your .netrc file should have correct +permissions(600). + +If machine name starts ".", aria2 performs domain match instead of +exact match. This is an extension of aria2. For example of domain +match, imagine the following .netrc entry: + +------------------------------------------------- +machine .example.org login myid password mypasswd +------------------------------------------------- + +In domain match, aria2.example.org matches .example.org and uses myid +and mypasswd. example.org also matches .example.org. But example.net +does not match .example.org. Control File ~~~~~~~~~~~~