Merge branch 'zi0r-master'

pull/388/head
Tatsuhiro Tsujikawa 2015-05-14 21:21:33 +09:00
commit a89c52734a
2 changed files with 3 additions and 2 deletions

View File

@ -1509,10 +1509,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers()
{
OptionHandler* op(new DefaultOptionHandler
(PREF_NETRC_PATH,
NO_DESCRIPTION,
TEXT_NETRC_PATH,
util::getHomeDir()+"/.netrc",
PATH_TO_FILE));
op->hide();
handlers.push_back(op);
}
// Proxy options

View File

@ -225,6 +225,8 @@
_(" -U, --user-agent=USER_AGENT Set user agent for http(s) downloads.")
#define TEXT_NO_NETRC \
_(" -n, --no-netrc[=true|false] Disables netrc support.")
#define TEXT_NETRC_PATH \
_(" --netrc-path=FILE Specify the path to the netrc file.")
#define TEXT_INPUT_FILE \
_(" -i, --input-file=FILE Downloads URIs found in FILE. You can specify\n" \
" multiple URIs for a single entity: separate\n" \