Skip to content

Commit

Permalink
Merge branch 'bc/imap-send-doc'
Browse files Browse the repository at this point in the history
* bc/imap-send-doc:
  imap-send doc: omit confusing "to use imap-send" modifier
  • Loading branch information
Junio C Hamano committed Sep 9, 2014
2 parents 50b335b + a127b3f commit 713c6f3
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions Documentation/git-imap-send.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,17 @@ 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 to use imap-send.
"[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 to use imap-send.
to the server. Required when imap.host is not set.

imap.host::
A URL identifying the server. Use a `imap://` prefix for non-secure
connections and a `imaps://` prefix for secure connections.
Ignored when imap.tunnel is set, but required to use imap-send
otherwise.
Ignored when imap.tunnel is set, but required otherwise.

imap.user::
The username to use when logging in to the server.
Expand Down

0 comments on commit 713c6f3

Please sign in to comment.