Skip to content

Commit ae46102

Browse files
pcloudsgitster
authored andcommitted
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>
1 parent 8fc3f75 commit ae46102

File tree

3 files changed

+46
-47
lines changed

3 files changed

+46
-47
lines changed

Documentation/config.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,7 @@ include::config/http.txt[]
353353

354354
include::config/i18n.txt[]
355355

356-
imap::
357-
The configuration variables in the 'imap' section are described
358-
in linkgit:git-imap-send[1].
356+
include::config/imap.txt[]
359357

360358
index.threads::
361359
Specifies the number of threads to spawn when loading the index.

Documentation/config/imap.txt

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
imap.folder::
2+
The folder to drop the mails into, which is typically the Drafts
3+
folder. For example: "INBOX.Drafts", "INBOX/Drafts" or
4+
"[Gmail]/Drafts". Required.
5+
6+
imap.tunnel::
7+
Command used to setup a tunnel to the IMAP server through which
8+
commands will be piped instead of using a direct network connection
9+
to the server. Required when imap.host is not set.
10+
11+
imap.host::
12+
A URL identifying the server. Use an `imap://` prefix for non-secure
13+
connections and an `imaps://` prefix for secure connections.
14+
Ignored when imap.tunnel is set, but required otherwise.
15+
16+
imap.user::
17+
The username to use when logging in to the server.
18+
19+
imap.pass::
20+
The password to use when logging in to the server.
21+
22+
imap.port::
23+
An integer port number to connect to on the server.
24+
Defaults to 143 for imap:// hosts and 993 for imaps:// hosts.
25+
Ignored when imap.tunnel is set.
26+
27+
imap.sslverify::
28+
A boolean to enable/disable verification of the server certificate
29+
used by the SSL/TLS connection. Default is `true`. Ignored when
30+
imap.tunnel is set.
31+
32+
imap.preformattedHTML::
33+
A boolean to enable/disable the use of html encoding when sending
34+
a patch. An html encoded patch will be bracketed with <pre>
35+
and have a content type of text/html. Ironically, enabling this
36+
option causes Thunderbird to send the patch as a plain/text,
37+
format=fixed email. Default is `false`.
38+
39+
imap.authMethod::
40+
Specify authenticate method for authentication with IMAP server.
41+
If Git was built with the NO_CURL option, or if your curl version is older
42+
than 7.34.0, or if you're running git-imap-send with the `--no-curl`
43+
option, the only supported method is 'CRAM-MD5'. If this is not set
44+
then 'git imap-send' uses the basic IMAP plaintext LOGIN command.

Documentation/git-imap-send.txt

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -57,50 +57,7 @@ to appropriate values.
5757
Variables
5858
~~~~~~~~~
5959

60-
imap.folder::
61-
The folder to drop the mails into, which is typically the Drafts
62-
folder. For example: "INBOX.Drafts", "INBOX/Drafts" or
63-
"[Gmail]/Drafts". Required.
64-
65-
imap.tunnel::
66-
Command used to setup a tunnel to the IMAP server through which
67-
commands will be piped instead of using a direct network connection
68-
to the server. Required when imap.host is not set.
69-
70-
imap.host::
71-
A URL identifying the server. Use an `imap://` prefix for non-secure
72-
connections and an `imaps://` prefix for secure connections.
73-
Ignored when imap.tunnel is set, but required otherwise.
74-
75-
imap.user::
76-
The username to use when logging in to the server.
77-
78-
imap.pass::
79-
The password to use when logging in to the server.
80-
81-
imap.port::
82-
An integer port number to connect to on the server.
83-
Defaults to 143 for imap:// hosts and 993 for imaps:// hosts.
84-
Ignored when imap.tunnel is set.
85-
86-
imap.sslverify::
87-
A boolean to enable/disable verification of the server certificate
88-
used by the SSL/TLS connection. Default is `true`. Ignored when
89-
imap.tunnel is set.
90-
91-
imap.preformattedHTML::
92-
A boolean to enable/disable the use of html encoding when sending
93-
a patch. An html encoded patch will be bracketed with <pre>
94-
and have a content type of text/html. Ironically, enabling this
95-
option causes Thunderbird to send the patch as a plain/text,
96-
format=fixed email. Default is `false`.
97-
98-
imap.authMethod::
99-
Specify authenticate method for authentication with IMAP server.
100-
If Git was built with the NO_CURL option, or if your curl version is older
101-
than 7.34.0, or if you're running git-imap-send with the `--no-curl`
102-
option, the only supported method is 'CRAM-MD5'. If this is not set
103-
then 'git imap-send' uses the basic IMAP plaintext LOGIN command.
60+
include::config/imap.txt[]
10461

10562
Examples
10663
~~~~~~~~

0 commit comments

Comments
 (0)