From 0ab23e7a8dcf2ff3117fde9f602003b924a6a42f Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Wed, 22 Apr 2015 22:48:49 +0900
Subject: [PATCH] Document --multiple-interface option

Thic commit documents --multiple-interface option, and move option
handler for it to the place alphabetical order as we do usually
---
 doc/manual-src/en/aria2c.rst |  8 ++++++++
 src/OptionHandlerFactory.cc  | 20 ++++++++++----------
 src/usage_text.h             |  4 +++-
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/doc/manual-src/en/aria2c.rst b/doc/manual-src/en/aria2c.rst
index 8df40fc7..a0d4254e 100644
--- a/doc/manual-src/en/aria2c.rst
+++ b/doc/manual-src/en/aria2c.rst
@@ -1336,6 +1336,14 @@ Advanced Options
   Possible Values: ``SSLv3``, ``TLSv1``, ``TLSv1.1``, ``TLSv1.2``
   Default: ``TLSv1``
 
+.. option:: --multiple-interface=<INTERFACES>
+
+  Comma separated list of interfaces to bind sockets to. Requests will
+  be splited among the interfaces to achieve link aggregation. You can
+  specify interface name, IP address and hostname. If
+  :option:`--interface` is used, this option will be ignored.
+  Possible Values: interface, IP address, hostname
+
 .. option:: --log-level=<LEVEL>
 
   Set log level to output.
diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc
index fb5e3493..b3ab8cc0 100644
--- a/src/OptionHandlerFactory.cc
+++ b/src/OptionHandlerFactory.cc
@@ -470,16 +470,6 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers()
     op->addTag(TAG_ADVANCED);
     handlers.push_back(op);
   }
-  {
-    OptionHandler* op(new DefaultOptionHandler
-                      (PREF_MULTIPLE_INTERFACE,
-                       TEXT_MULTIPLE_INTERFACE,
-                       NO_DEFAULT_VALUE,
-                       "interface, IP address, hostname",
-                       OptionHandler::REQ_ARG));
-    op->addTag(TAG_ADVANCED);
-    handlers.push_back(op);
-  }
   {
     OptionHandler* op(new DefaultOptionHandler
                       (PREF_LOG,
@@ -605,6 +595,16 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers()
     handlers.push_back(op);
   }
 #endif // ENABLE_SSL
+  {
+    OptionHandler* op(new DefaultOptionHandler
+                      (PREF_MULTIPLE_INTERFACE,
+                       TEXT_MULTIPLE_INTERFACE,
+                       NO_DEFAULT_VALUE,
+                       "interface, IP address, hostname",
+                       OptionHandler::REQ_ARG));
+    op->addTag(TAG_ADVANCED);
+    handlers.push_back(op);
+  }
   {
     OptionHandler* op(new BooleanOptionHandler
                       (PREF_NO_CONF,
diff --git a/src/usage_text.h b/src/usage_text.h
index ba2645f8..17bf420d 100644
--- a/src/usage_text.h
+++ b/src/usage_text.h
@@ -603,7 +603,9 @@
   _(" --multiple-interface=INTERFACES Comma separated list of interfaces to bind\n" \
     "                              sockets to. Requests will be splited among the\n" \
     "                              interfaces to achieve link aggregation. You can\n" \
-    "                              specify interface name, IP address and hostname.")
+    "                              specify interface name, IP address and hostname.\n" \
+    "                              If --interface is used, this option will be\n" \
+    "                              ignored.")
 #define TEXT_DISABLE_IPV6                               \
   _(" --disable-ipv6[=true|false]  Disable IPv6.")
 #define TEXT_BT_SAVE_METADATA                                           \