git-imap-send.txt: move imap.* to a separate file

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index a44e717f30c5e16bdebdd9d084eb271ad80a4a1e..d26656df953c1f17dc6eb2dd8ec36f993b3e1475 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -353,9 +353,7 @@ include::config/http.txt[]
 
 include::config/i18n.txt[]
 
-imap::
-       The configuration variables in the 'imap' section are described
-       in linkgit:git-imap-send[1].
+include::config/imap.txt[]
 
 index.threads::
        Specifies the number of threads to spawn when loading the index.

diff --git a/Documentation/config/imap.txt b/Documentation/config/imap.txt
new file mode 100644 (file)
index 0000000..06166fb
--- /dev/null
+++ b/Documentation/config/imap.txt
@@ -0,0 +1,44 @@
+imap.folder::
+       The folder to drop the mails into, which is typically the Drafts
+       folder. For example: "INBOX.Drafts", "INBOX/Drafts" or
+       "[Gmail]/Drafts". Required.
+
+imap.tunnel::
+       Command used to setup a tunnel to the IMAP server through which
+       commands will be piped instead of using a direct network connection
+       to the server. Required when imap.host is not set.
+
+imap.host::
+       A URL identifying the server. Use an `imap://` prefix for non-secure
+       connections and an `imaps://` prefix for secure connections.
+       Ignored when imap.tunnel is set, but required otherwise.
+
+imap.user::
+       The username to use when logging in to the server.
+
+imap.pass::
+       The password to use when logging in to the server.
+
+imap.port::
+       An integer port number to connect to on the server.
+       Defaults to 143 for imap:// hosts and 993 for imaps:// hosts.
+       Ignored when imap.tunnel is set.
+
+imap.sslverify::
+       A boolean to enable/disable verification of the server certificate
+       used by the SSL/TLS connection. Default is `true`. Ignored when
+       imap.tunnel is set.
+
+imap.preformattedHTML::
+       A boolean to enable/disable the use of html encoding when sending
+       a patch.  An html encoded patch will be bracketed with <pre>
+       and have a content type of text/html.  Ironically, enabling this
+       option causes Thunderbird to send the patch as a plain/text,
+       format=fixed email.  Default is `false`.
+
+imap.authMethod::
+       Specify authenticate method for authentication with IMAP server.
+       If Git was built with the NO_CURL option, or if your curl version is older
+       than 7.34.0, or if you're running git-imap-send with the `--no-curl`
+       option, the only supported method is 'CRAM-MD5'. If this is not set
+       then 'git imap-send' uses the basic IMAP plaintext LOGIN command.

diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt
index 7b157441eb3ee9e84e98f36f74a6083f071f36e1..65b53fcc47d6b93cd2a63309401c227cf899794f 100644 (file)
--- a/Documentation/git-imap-send.txt
+++ b/Documentation/git-imap-send.txt
@@ -57,50 +57,7 @@ to appropriate values.
 Variables
 ~~~~~~~~~
 
-imap.folder::
-       The folder to drop the mails into, which is typically the Drafts
-       folder. For example: "INBOX.Drafts", "INBOX/Drafts" or
-       "[Gmail]/Drafts". Required.
-
-imap.tunnel::
-       Command used to setup a tunnel to the IMAP server through which
-       commands will be piped instead of using a direct network connection
-       to the server. Required when imap.host is not set.
-
-imap.host::
-       A URL identifying the server. Use an `imap://` prefix for non-secure
-       connections and an `imaps://` prefix for secure connections.
-       Ignored when imap.tunnel is set, but required otherwise.
-
-imap.user::
-       The username to use when logging in to the server.
-
-imap.pass::
-       The password to use when logging in to the server.
-
-imap.port::
-       An integer port number to connect to on the server.
-       Defaults to 143 for imap:// hosts and 993 for imaps:// hosts.
-       Ignored when imap.tunnel is set.
-
-imap.sslverify::
-       A boolean to enable/disable verification of the server certificate
-       used by the SSL/TLS connection. Default is `true`. Ignored when
-       imap.tunnel is set.
-
-imap.preformattedHTML::
-       A boolean to enable/disable the use of html encoding when sending
-       a patch.  An html encoded patch will be bracketed with <pre>
-       and have a content type of text/html.  Ironically, enabling this
-       option causes Thunderbird to send the patch as a plain/text,
-       format=fixed email.  Default is `false`.
-
-imap.authMethod::
-       Specify authenticate method for authentication with IMAP server.
-       If Git was built with the NO_CURL option, or if your curl version is older
-       than 7.34.0, or if you're running git-imap-send with the `--no-curl`
-       option, the only supported method is 'CRAM-MD5'. If this is not set
-       then 'git imap-send' uses the basic IMAP plaintext LOGIN command.
+include::config/imap.txt[]
 
 Examples
 ~~~~~~~~