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
pull/1/head
Tatsuhiro Tsujikawa 2009-05-13 12:30:38 +00:00
parent 842dd43aac
commit bab4b09a36
5 changed files with 35 additions and 28 deletions

View File

@ -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> 2009-05-13 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Removed garbage "\" character before ' Removed garbage "\" character before '

View File

@ -146,6 +146,11 @@ means unlimited\&. Default:
\fI5\fR \fI5\fR
.RE .RE
.PP .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 \fB\-\-no\-proxy\fR=DOMAINS
.RS 4 .RS 4
Specify comma separated hostnames or domains where proxy should not be used\&. Specify comma separated hostnames or domains where proxy should not be used\&.
@ -431,11 +436,6 @@ or
Reuse connection in FTP\&. Default: Reuse connection in FTP\&. Default:
\fItrue\fR \fItrue\fR
.RE .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" .SS "BitTorrent/Metalink Options"
.PP .PP
\fB\-\-select\-file\fR=INDEX\&... \fB\-\-select\-file\fR=INDEX\&...

View File

@ -581,6 +581,14 @@ downloading a file like BitTorrent.</p></div>
</p> </p>
</dd> </dd>
<dt class="hdlist1"> <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 <strong>--no-proxy</strong>=DOMAINS
</dt> </dt>
<dd> <dd>
@ -951,14 +959,6 @@ aria2c -o myfile.zip "http://mirror1/file.zip" "http://mirror2/file.zip"</td>
Default: <em>true</em> Default: <em>true</em>
</p> </p>
</dd> </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> </dl></div>
<h3 id="_bittorrent_metalink_options">BitTorrent/Metalink Options</h3><div style="clear:left"></div> <h3 id="_bittorrent_metalink_options">BitTorrent/Metalink Options</h3><div style="clear:left"></div>
<div class="dlist"><dl> <div class="dlist"><dl>
@ -2723,7 +2723,7 @@ files in the program, then also delete it here.</p></div>
</div> </div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2009-05-13 01:42:14 JST Last updated 2009-05-13 21:29:04 JST
</div> </div>
</div> </div>
</body> </body>

View File

@ -110,6 +110,9 @@ HTTP/FTP Options
Set number of tries. '0' means unlimited. Set number of tries. '0' means unlimited.
Default: '5' Default: '5'
*-n*, *--no-netrc*::
Disables netrc support. netrc support is enabled by default.
*--no-proxy*=DOMAINS:: *--no-proxy*=DOMAINS::
Specify comma separated hostnames or domains where proxy should not be Specify comma separated hostnames or domains where proxy should not be
used. used.
@ -296,9 +299,6 @@ FTP Specific Options
Reuse connection in FTP. Reuse connection in FTP.
Default: 'true' Default: 'true'
*-n*, *--no-netrc*::
Disables netrc support. netrc support is enabled by default.
BitTorrent/Metalink Options BitTorrent/Metalink Options
~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
*--select-file*=INDEX...:: *--select-file*=INDEX...::

View File

@ -431,6 +431,17 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
op->addTag(TAG_HTTP); op->addTag(TAG_HTTP);
handlers.push_back(op); 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 SharedHandle<OptionHandler> op(new DefaultOptionHandler
(PREF_OUT, (PREF_OUT,
@ -762,17 +773,6 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
op->hide(); op->hide();
handlers.push_back(op); 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 // Proxy options
{ {
SharedHandle<OptionHandler> op(new HttpProxyOptionHandler SharedHandle<OptionHandler> op(new HttpProxyOptionHandler