From a481548954acd833af723ad33da174e1fdee5707 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Thu, 17 Sep 2009 14:37:36 +0000
Subject: [PATCH] 2009-09-17  Tatsuhiro Tsujikawa 
 <t-tujikawa@users.sourceforge.net>

	Added help categories: #cookie and #hook. Added #https tag to
	--https-proxy and --https-proxy, --all-proxy and --no-proxy.
	* src/OptionHandlerFactory.cc
	* src/help_tags
---
 ChangeLog                   |  7 +++++++
 src/OptionHandlerFactory.cc | 13 ++++++++++++-
 src/help_tags.h             |  2 ++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b645867f..0913cd99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-17  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Added help categories: #cookie and #hook. Added #https tag to
+	--https-proxy and --https-proxy, --all-proxy and --no-proxy.
+	* src/OptionHandlerFactory.cc
+	* src/help_tags
+
 2009-09-16  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Made MSG_NOT_FILE translatable.
diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc
index a46d88cb..55ee627d 100644
--- a/src/OptionHandlerFactory.cc
+++ b/src/OptionHandlerFactory.cc
@@ -314,6 +314,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
 				    NO_DEFAULT_VALUE,
 				    "/path/to/command"));
     op->addTag(TAG_ADVANCED);
+    op->addTag(TAG_HOOK);
     handlers.push_back(op);
   }
   {
@@ -323,6 +324,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
 				    NO_DEFAULT_VALUE,
 				    "/path/to/command"));
     op->addTag(TAG_ADVANCED);
+    op->addTag(TAG_HOOK);
     handlers.push_back(op);
   }
   {
@@ -332,6 +334,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
 				    NO_DEFAULT_VALUE,
 				    "/path/to/command"));
     op->addTag(TAG_ADVANCED);
+    op->addTag(TAG_HOOK);
     handlers.push_back(op);
   }
   {
@@ -341,6 +344,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
 				    NO_DEFAULT_VALUE,
 				    "/path/to/command"));
     op->addTag(TAG_ADVANCED);
+    op->addTag(TAG_HOOK);
     handlers.push_back(op);
   }
   {
@@ -719,6 +723,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
 				    "/path/to/file"));
     op->addTag(TAG_BASIC);
     op->addTag(TAG_HTTP);
+    op->addTag(TAG_COOKIE);
     handlers.push_back(op);
   }
   {
@@ -752,6 +757,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
 				    NO_DEFAULT_VALUE,
 				    "/path/to/file"));
     op->addTag(TAG_HTTP);
+    op->addTag(TAG_COOKIE);
     handlers.push_back(op);
   }
   {
@@ -843,6 +849,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
 				    TEXT_HTTPS_PROXY,
 				    NO_DEFAULT_VALUE));
     op->addTag(TAG_HTTP);
+    op->addTag(TAG_HTTPS);
     handlers.push_back(op);
   }
   {
@@ -860,6 +867,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
 				    NO_DEFAULT_VALUE));
     op->addTag(TAG_FTP);
     op->addTag(TAG_HTTP);
+    op->addTag(TAG_HTTPS);
     handlers.push_back(op);
   }
   {
@@ -868,6 +876,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
 				    TEXT_NO_PROXY));
     op->addTag(TAG_FTP);
     op->addTag(TAG_HTTP);
+    op->addTag(TAG_HTTPS);
     handlers.push_back(op);
   }
   {
@@ -1266,7 +1275,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
 				    TAG_BASIC,
 				    StringFormat
 				    ("%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, "
-				     "%s",
+				     "%s, %s, %s",
 				     TAG_BASIC,
 				     TAG_ADVANCED,
 				     TAG_HTTP,
@@ -1274,6 +1283,8 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
 				     TAG_FTP,
 				     TAG_METALINK,
 				     TAG_BITTORRENT,
+				     TAG_COOKIE,
+				     TAG_HOOK,
 				     TAG_XML_RPC,
 				     TAG_EXPERIMENTAL,
 				     TAG_HELP,
diff --git a/src/help_tags.h b/src/help_tags.h
index 860a8c0c..7ff3c1f0 100644
--- a/src/help_tags.h
+++ b/src/help_tags.h
@@ -42,6 +42,8 @@
 #define TAG_FTP "#ftp"
 #define TAG_METALINK "#metalink"
 #define TAG_BITTORRENT "#bittorrent"
+#define TAG_COOKIE "#cookie"
+#define TAG_HOOK "#hook"
 #define TAG_XML_RPC "#xml-rpc"
 #define TAG_EXPERIMENTAL "#experimental"
 #define TAG_HELP "#help"