git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 37/78] git-imap-send.txt: move imap.* to a separate file
Date: Sat, 27 Oct 2018 08:23:10 +0200	[thread overview]
Message-ID: <20181027062351.30446-38-pclouds@gmail.com> (raw)
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 Documentation/config.txt        |  4 +--
 Documentation/config/imap.txt   | 44 ++++++++++++++++++++++++++++++++
 Documentation/git-imap-send.txt | 45 +--------------------------------
 3 files changed, 46 insertions(+), 47 deletions(-)
 create mode 100644 Documentation/config/imap.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index a44e717f30..d26656df95 100644
--- 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
index 0000000000..06166fb5c0
--- /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 7b157441eb..65b53fcc47 100644
--- 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
 ~~~~~~~~
-- 
2.19.1.647.g708186aaf9


  parent reply	other threads:[~2018-10-27  6:24 UTC|newest]

Thread overview: 80+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-27  6:22 [PATCH 00/78] nd/config-split reroll Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 01/78] Update makefile in preparation for Documentation/config/*.txt Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 02/78] config.txt: move advice.* to a separate file Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 03/78] config.txt: move core.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 04/78] config.txt: move add.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 05/78] config.txt: move alias.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 06/78] config.txt: move am.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 07/78] config.txt: move apply.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 08/78] config.txt: move blame.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 09/78] config.txt: move branch.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 10/78] config.txt: move browser.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 11/78] config.txt: move checkout.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 12/78] config.txt: move clean.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 13/78] config.txt: move color.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 14/78] config.txt: move column.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 15/78] config.txt: move commit.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 16/78] config.txt: move credential.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 17/78] config.txt: move completion.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 18/78] config.txt: move diff-config.txt to config/ Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 19/78] config.txt: move difftool.* to a separate file Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 20/78] config.txt: move fastimport.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 21/78] config.txt: move fetch-config.txt to config/ Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 22/78] config.txt: move filter.* to a separate file Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 23/78] config.txt: move format-config.txt to config/ Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 24/78] config.txt: move fmt-merge-msg-config.txt " Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 25/78] config.txt: move fsck.* to a separate file Nguyễn Thái Ngọc Duy
2018-10-27  6:22 ` [PATCH 26/78] config.txt: move gc.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 27/78] config.txt: move gitcvs-config.txt to config/ Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 28/78] config.txt: move gitweb.* to a separate file Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 29/78] config.txt: move grep.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 30/78] config.txt: move gpg.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 31/78] config.txt: move gui-config.txt to config/ Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 32/78] config.txt: move guitool.* to a separate file Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 33/78] config.txt: move help.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 34/78] config.txt: move ssh.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 35/78] config.txt: move http.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 36/78] config.txt: move i18n.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` Nguyễn Thái Ngọc Duy [this message]
2018-10-27  6:23 ` [PATCH 38/78] config.txt: move index.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 39/78] config.txt: move init.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 40/78] config.txt: move instaweb.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 41/78] config.txt: move interactive.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 42/78] config.txt: move log.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 43/78] config.txt: move mailinfo.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 44/78] config.txt: move mailmap.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 45/78] config.txt: move man.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 46/78] config.txt: move merge-config.txt to config/ Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 47/78] config.txt: move mergetool.* to a separate file Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 48/78] config.txt: move notes.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 49/78] config.txt: move pack.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 50/78] config.txt: move pager.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 51/78] config.txt: move pretty.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 52/78] config.txt: move protocol.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 53/78] config.txt: move pull-config.txt to config/ Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 54/78] config.txt: move push-config.txt " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 55/78] config.txt: move rebase-config.txt " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 56/78] config.txt: move receive-config.txt " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 57/78] config.txt: move remote.* to a separate file Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 58/78] config.txt: move remotes.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 59/78] config.txt: move repack.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 60/78] config.txt: move rerere.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 61/78] config.txt: move reset.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 62/78] config.txt: move sendemail-config.txt to config/ Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 63/78] config.txt: move sequencer.* to a separate file Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 64/78] config.txt: move showBranch.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 65/78] config.txt: move splitIndex.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 66/78] config.txt: move status.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 67/78] config.txt: move stash.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 68/78] config.txt: move submodule.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 69/78] config.txt: move tag.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 70/78] config.txt: move transfer.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 71/78] config.txt: move uploadarchive.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 72/78] config.txt: move uploadpack.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 73/78] config.txt: move url.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 74/78] config.txt: move user.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 75/78] config.txt: move versionsort.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 76/78] config.txt: move web.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 77/78] config.txt: move worktree.* " Nguyễn Thái Ngọc Duy
2018-10-27  6:23 ` [PATCH 78/78] config.txt: remove config/dummy.txt Nguyễn Thái Ngọc Duy
2018-10-29  1:28 ` [PATCH 00/78] nd/config-split reroll Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181027062351.30446-38-pclouds@gmail.com \
    --to=pclouds@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).