2009-02-14 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

Rewritten the section for configuration file.
	* README
	* doc/aria2c.1.txt

ChangeLog

@@ -1,3 +1,9 @@
+2009-02-14  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Rewritten the section for configuration file.
+	* README
+	* doc/aria2c.1.txt
+	
 2009-02-13  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Fixed the segmentation fault during execution of choking algorithm

README

@@ -261,10 +261,17 @@ host=localhost, protocol=ftp, dl_speed=0, last_updated=1222491632, status=ERROR
 
 Configuration file
 ------------------
-Configuration file must be placed under $HOME/.aria2 and must be named
+
-as aria2.conf.  In each line, there is 1 parameter whose syntax is
+By default, aria2 parses "$HOME/.aria2/aria2.conf" as a configuraiton
-name=value pair, where name is the long command-line option name
+file. You can specify the path to configuration file using
-without \-- prefix.  The lines beginning '#' are treated as comments.
+\--conf-path option.  If you don't want to use the configuraitonf
+file, use \--no-conf option.
+
+The configuration file is a text file and has 1 option per each
+line. In each line, you can specify name-value pair in the format:
+NAME=VALUE, where name is the long command-line option name without
+"\--" prefix. You can use same syntax for the command-line option. The
+lines beginning "#" are treated as comments.
 
 Example:
 --------------------------------------

README.html

@@ -871,10 +871,15 @@ host=localhost, protocol=ftp, dl_speed=0, last_updated=1222491632, status=ERROR<
 </div>
 <h2 id="_configuration_file">9. Configuration file</h2>
 <div class="sectionbody">
-<div class="para"><p>Configuration file must be placed under $HOME/.aria2 and must be named
+<div class="para"><p>By default, aria2 parses "$HOME/.aria2/aria2.conf" as a configuraiton
-as aria2.conf.  In each line, there is 1 parameter whose syntax is
+file. You can specify the path to configuration file using
-name=value pair, where name is the long command-line option name
+--conf-path option.  If you don't want to use the configuraitonf
-without -- prefix.  The lines beginning <em>#</em> are treated as comments.</p></div>
+file, use --no-conf option.</p></div>
+<div class="para"><p>The configuration file is a text file and has 1 option per each
+line. In each line, you can specify name-value pair in the format:
+NAME=VALUE, where name is the long command-line option name without
+"--" prefix. You can use same syntax for the command-line option. The
+lines beginning "#" are treated as comments.</p></div>
 <div class="para"><p>Example:</p></div>
 <div class="listingblock">
 <div class="content">
@@ -886,7 +891,7 @@ max-upload-limit=40K</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2008-12-17 21:37:38 JST
+Last updated 2009-02-14 18:26:21 JST
 </div>
 </div>
 </body>

doc/aria2c.1

@@ -1,11 +1,11 @@
 .\"     Title: aria2c
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
-.\"      Date: 02/07/2009
+.\"      Date: 02/14/2009
 .\"    Manual: 
 .\"    Source: 
 .\"
-.TH "ARIA2C" "1" "02/07/2009" "" ""
+.TH "ARIA2C" "1" "02/14/2009" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -1584,7 +1584,9 @@ host=localhost, protocol=ftp, dl_speed=0, last_updated=1222491632, status=ERROR
 .RE
 .SH "FILES"
 .SS "aria2\&.conf"
-User configuration file\&. It must be placed under $HOME/\&.aria2 and must be named aria2\&.conf\&. In each line, there is 1 parameter whose syntax is name=value pair, where name is the long command\-line option name without \fI\-\-\fR prefix\&. The lines beginning \fI#\fR are treated as comments\&.
+By default, aria2 parses \fI$HOME/\&.aria2/aria2\&.conf\fR as a configuraiton file\&. You can specify the path to configuration file using \fB\-\-conf\-path\fR option\&. If you don\'t want to use the configuraitonf file, use \fB\-\-no\-conf\fR option\&.
+.sp
+The configuration file is a text file and has 1 option per each line\&. In each line, you can specify name\-value pair in the format: NAME=VALUE, where name is the long command\-line option name without "\-\-" prefix\&. You can use same syntax for the command\-line option\&. The lines beginning "#" are treated as comments\&.
 .sp
 .sp
 .RS 4

doc/aria2c.1.html

@@ -2022,11 +2022,15 @@ host=localhost, protocol=ftp, dl_speed=0, last_updated=1222491632, status=ERROR<
 <h2 id="_files">FILES</h2>
 <div class="sectionbody">
 <h3 id="_aria2_conf">aria2.conf</h3><div style="clear:left"></div>
-<div class="para"><p>User configuration file.
+<div class="para"><p>By default, aria2 parses <em>$HOME/.aria2/aria2.conf</em> as a configuraiton
-It must be placed under $HOME/.aria2 and must be named aria2.conf.
+file. You can specify the path to configuration file using
-In each line, there is 1 parameter whose syntax is name=value pair,
+<strong>--conf-path</strong> option.  If you don't want to use the configuraitonf
-where name is the long command-line option name without <em>--</em> prefix.
+file, use <strong>--no-conf</strong> option.</p></div>
-The lines beginning <em>#</em> are treated as comments.</p></div>
+<div class="para"><p>The configuration file is a text file and has 1 option per each
+line. In each line, you can specify name-value pair in the format:
+NAME=VALUE, where name is the long command-line option name without
+"--" prefix. You can use same syntax for the command-line option. The
+lines beginning "#" are treated as comments.</p></div>
 <div class="listingblock">
 <div class="content">
 <pre><tt># sample configuration file for aria2c
@@ -2223,7 +2227,7 @@ files in the program, then also delete it here.</p></div>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-02-07 23:00:30 JST
+Last updated 2009-02-14 18:27:19 JST
 </div>
 </div>
 </body>

doc/aria2c.1.txt

@@ -1012,11 +1012,17 @@ FILES
 -----
 aria2.conf
 ~~~~~~~~~~
-User configuration file.
+
-It must be placed under $HOME/.aria2 and must be named aria2.conf.
+By default, aria2 parses '$HOME/.aria2/aria2.conf' as a configuraiton
-In each line, there is 1 parameter whose syntax is name=value pair,
+file. You can specify the path to configuration file using
-where name is the long command-line option name without '--' prefix.
+*--conf-path* option.  If you don't want to use the configuraitonf
-The lines beginning '#' are treated as comments.
+file, use *--no-conf* option.
+
+The configuration file is a text file and has 1 option per each
+line. In each line, you can specify name-value pair in the format:
+NAME=VALUE, where name is the long command-line option name without
+"--" prefix. You can use same syntax for the command-line option. The
+lines beginning "#" are treated as comments.
 
 --------------------------------------
 # sample configuration file for aria2c