Merge branch 'bc/imap-send-doc'

* bc/imap-send-doc:
  imap-send doc: omit confusing "to use imap-send" modifier
This commit is contained in:
Junio C Hamano 2014-09-09 12:53:55 -07:00
Родитель 50b335b783 a127b3f24d
Коммит 713c6f3ab0
1 изменённых файлов: 3 добавлений и 4 удалений

Просмотреть файл

@ -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.