From bab4b09a367a2c04381dba062f28690dd86020f0 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Wed, 13 May 2009 12:30:38 +0000
Subject: [PATCH] 2009-05-13  Tatsuhiro Tsujikawa 
 <t-tujikawa@users.sourceforge.net>

	Moved --no-netrc option from ftp option section to http/ftp option
	section.
	* doc/aria2c.1.txt
	* src/OptionHandlerFactory.cc
---
 ChangeLog                   |  7 +++++++
 doc/aria2c.1                | 10 +++++-----
 doc/aria2c.1.html           | 18 +++++++++---------
 doc/aria2c.1.txt            |  6 +++---
 src/OptionHandlerFactory.cc | 22 +++++++++++-----------
 5 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e209a2cd..ed524474 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-05-13  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Moved --no-netrc option from ftp option section to http/ftp option
+	section.
+	* doc/aria2c.1.txt
+	* src/OptionHandlerFactory.cc
+	
 2009-05-13  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Removed garbage "\" character before '
diff --git a/doc/aria2c.1 b/doc/aria2c.1
index 5836721e..8ca35ad8 100644
--- a/doc/aria2c.1
+++ b/doc/aria2c.1
@@ -146,6 +146,11 @@ means unlimited\&. Default:
 \fI5\fR
 .RE
 .PP
+\fB\-n\fR, \fB\-\-no\-netrc\fR
+.RS 4
+Disables netrc support\&. netrc support is enabled by default\&.
+.RE
+.PP
 \fB\-\-no\-proxy\fR=DOMAINS
 .RS 4
 Specify comma separated hostnames or domains where proxy should not be used\&.
@@ -431,11 +436,6 @@ or
 Reuse connection in FTP\&. Default:
 \fItrue\fR
 .RE
-.PP
-\fB\-n\fR, \fB\-\-no\-netrc\fR
-.RS 4
-Disables netrc support\&. netrc support is enabled by default\&.
-.RE
 .SS "BitTorrent/Metalink Options"
 .PP
 \fB\-\-select\-file\fR=INDEX\&...
diff --git a/doc/aria2c.1.html b/doc/aria2c.1.html
index e0a2a866..3ed5812e 100644
--- a/doc/aria2c.1.html
+++ b/doc/aria2c.1.html
@@ -581,6 +581,14 @@ downloading a file like BitTorrent.</p></div>
 </p>
 </dd>
 <dt class="hdlist1">
+<strong>-n</strong>, <strong>--no-netrc</strong>
+</dt>
+<dd>
+<p>
+  Disables netrc support. netrc support is enabled by default.
+</p>
+</dd>
+<dt class="hdlist1">
 <strong>--no-proxy</strong>=DOMAINS
 </dt>
 <dd>
@@ -951,14 +959,6 @@ aria2c -o myfile.zip "http://mirror1/file.zip" "http://mirror2/file.zip"</td>
   Default: <em>true</em>
 </p>
 </dd>
-<dt class="hdlist1">
-<strong>-n</strong>, <strong>--no-netrc</strong>
-</dt>
-<dd>
-<p>
-  Disables netrc support. netrc support is enabled by default.
-</p>
-</dd>
 </dl></div>
 <h3 id="_bittorrent_metalink_options">BitTorrent/Metalink Options</h3><div style="clear:left"></div>
 <div class="dlist"><dl>
@@ -2723,7 +2723,7 @@ files in the program, then also delete it here.</p></div>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-05-13 01:42:14 JST
+Last updated 2009-05-13 21:29:04 JST
 </div>
 </div>
 </body>
diff --git a/doc/aria2c.1.txt b/doc/aria2c.1.txt
index 8d555d11..d2c15731 100644
--- a/doc/aria2c.1.txt
+++ b/doc/aria2c.1.txt
@@ -110,6 +110,9 @@ HTTP/FTP Options
   Set number of tries. '0' means unlimited.
   Default: '5'
 
+*-n*, *--no-netrc*::
+  Disables netrc support. netrc support is enabled by default.
+
 *--no-proxy*=DOMAINS::
   Specify comma separated hostnames or domains where proxy should not be
   used.
@@ -296,9 +299,6 @@ FTP Specific Options
   Reuse connection in FTP.
   Default: 'true'
 
-*-n*, *--no-netrc*::
-  Disables netrc support. netrc support is enabled by default.
-
 BitTorrent/Metalink Options
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 *--select-file*=INDEX...::
diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc
index dacaee96..b1362d99 100644
--- a/src/OptionHandlerFactory.cc
+++ b/src/OptionHandlerFactory.cc
@@ -431,6 +431,17 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
     op->addTag(TAG_HTTP);
     handlers.push_back(op);
   }
+  {
+    SharedHandle<OptionHandler> op(new BooleanOptionHandler
+				   (PREF_NO_NETRC,
+				    TEXT_NO_NETRC,
+				    V_FALSE, // TODO ommit?
+				    OptionHandler::NO_ARG,
+				    'n'));
+    op->addTag(TAG_FTP);
+    op->addTag(TAG_HTTP);
+    handlers.push_back(op);
+  }
   {
     SharedHandle<OptionHandler> op(new DefaultOptionHandler
 				   (PREF_OUT,
@@ -762,17 +773,6 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
     op->hide();
     handlers.push_back(op);
   }
-  {
-    SharedHandle<OptionHandler> op(new BooleanOptionHandler
-				   (PREF_NO_NETRC,
-				    TEXT_NO_NETRC,
-				    V_FALSE, // TODO ommit?
-				    OptionHandler::NO_ARG,
-				    'n'));
-    op->addTag(TAG_FTP);
-    op->addTag(TAG_HTTP);
-    handlers.push_back(op);
-  }
   // Proxy options
   {
     SharedHandle<OptionHandler> op(new HttpProxyOptionHandler