2010-11-23 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Made --continue, --daemon, --no-conf, --no-netrc and --show-files
	option take optional argument.
	* doc/aria2c.1.txt
	* src/OptionHandlerFactory.cc
	* src/usage_text.h

2 files changed, 14 insertions, 14 deletions

diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc
index 375a657b..d1120ad0 100644
--- a/src/OptionHandlerFactory.cc
+++ b/src/OptionHandlerFactory.cc
@@ -144,8 +144,8 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
     SharedHandle<OptionHandler> op(new BooleanOptionHandler
                                    (PREF_CONTINUE,
                                     TEXT_CONTINUE,
-                                    A2_V_FALSE, // TODO ommit?
-                                    OptionHandler::NO_ARG,
+                                    A2_V_FALSE,
+                                    OptionHandler::OPT_ARG,
                                     'c'));
     op->addTag(TAG_BASIC);
     op->addTag(TAG_FTP);
@@ -157,8 +157,8 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
                                    (PREF_DAEMON,
                                     TEXT_DAEMON,
                                     A2_V_FALSE,
-                                    OptionHandler::NO_ARG,
-                                    'D')); // TODO ommit?
+                                    OptionHandler::OPT_ARG,
+                                    'D'));
     op->addTag(TAG_ADVANCED);
     handlers.push_back(op);
   }
@@ -416,7 +416,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
                                    (PREF_NO_CONF,
                                     TEXT_NO_CONF,
                                     A2_V_FALSE,
-                                    OptionHandler::NO_ARG));
+                                    OptionHandler::OPT_ARG));
     op->addTag(TAG_ADVANCED);
     handlers.push_back(op);
   }
@@ -653,8 +653,8 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
     SharedHandle<OptionHandler> op(new BooleanOptionHandler
                                    (PREF_NO_NETRC,
                                     TEXT_NO_NETRC,
-                                    A2_V_FALSE, // TODO ommit?
-                                    OptionHandler::NO_ARG,
+                                    A2_V_FALSE,
+                                    OptionHandler::OPT_ARG,
                                     'n'));
     op->addTag(TAG_FTP);
     op->addTag(TAG_HTTP);
@@ -1138,8 +1138,8 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
     SharedHandle<OptionHandler> op(new BooleanOptionHandler
                                    (PREF_SHOW_FILES,
                                     TEXT_SHOW_FILES,
-                                    A2_V_FALSE, // TODO ommit?
-                                    OptionHandler::NO_ARG,
+                                    A2_V_FALSE,
+                                    OptionHandler::OPT_ARG,
                                     'S'));
     op->addTag(TAG_BASIC);
     op->addTag(TAG_BITTORRENT);
diff --git a/src/usage_text.h b/src/usage_text.h
index eaa7acbb..a77f3d45 100644
--- a/src/usage_text.h
+++ b/src/usage_text.h
@@ -42,7 +42,7 @@
   _(" -l, --log=LOG                The file name of the log file. If '-' is\n" \
     "                              specified, log is written to stdout.")
 #define TEXT_DAEMON                                                     \
-  _(" -D, --daemon                 Run as daemon. The current working directory will\n" \
+  _(" -D, --daemon[=true|false]    Run as daemon. The current working directory will\n" \
     "                              be changed to \"/\" and standard input, standard\n" \
     "                              output and standard error will be redirected to\n" \
     "                              \"/dev/null\".")
@@ -199,7 +199,7 @@
     "                              checksum while downloading a file if chunk\n" \
     "                              checksums are provided.")
 #define TEXT_CONTINUE                                                   \
-  _(" -c, --continue               Continue downloading a partially downloaded\n" \
+  _(" -c, --continue[=true|false]  Continue downloading a partially downloaded\n" \
     "                              file. Use this option to resume a download\n" \
     "                              started by a web browser or another program\n" \
     "                              which downloads files sequentially from the\n" \
@@ -208,7 +208,7 @@
 #define TEXT_USER_AGENT                                                 \
   _(" -U, --user-agent=USER_AGENT  Set user agent for http(s) downloads.")
 #define TEXT_NO_NETRC                                           \
-  _(" -n, --no-netrc               Disables netrc support.")
+  _(" -n, --no-netrc[=true|false]  Disables netrc support.")
 #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" \
@@ -231,7 +231,7 @@
     "                              overwritten. Session Cookies are also saved and\n" \
     "                              their expiry values are treated as 0.")
 #define TEXT_SHOW_FILES                                                 \
-  _(" -S, --show-files             Print file listing of .torrent or .metalink file\n" \
+  _(" -S, --show-files[=true|false] Print file listing of .torrent or .metalink file\n" \
     "                              and exit. More detailed information will be listed\n" \
     "                              in case of torrent file.")
 #define TEXT_SELECT_FILE                                                \
@@ -388,7 +388,7 @@
     "                              \"#http\". If non-tag word is given, print the usage\n" \
     "                              for the options whose name includes that word.")
 #define TEXT_NO_CONF                                                    \
-  _(" --no-conf                    Disable loading aria2.conf file.")
+  _(" --no-conf[=true|false]       Disable loading aria2.conf file.")
 #define TEXT_CONF_PATH                                                  \
   _(" --conf-path=PATH             Change the configuration file path to PATH.")
 #define TEXT_STOP                                                       \