git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: astian <astian@eclipso.at>
To: git@vger.kernel.org
Cc: astian <astian@eclipso.at>
Subject: [PATCH 4/4] Doc/config.txt: fix documentation for smtpEncryption
Date: Sat,  8 Jul 2017 20:34:13 +0000	[thread overview]
Message-ID: <20170708203413.16442-5-astian@eclipso.at> (raw)
In-Reply-To: <20170708203413.16442-1-astian@eclipso.at>

Stop saying that smtpEncryption (a configuration variable used by
git-send-email) is not usable in "sendemail.<identity>" subsections,
because that's false.

Signed-off-by: astian <astian@eclipso.at>
---
 Documentation/config.txt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index d5c9c4cab..f40758c31 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2899,10 +2899,6 @@ sendemail.identity::
 	values in the 'sendemail' section. The default identity is
 	the value of `sendemail.identity`.
 
-sendemail.smtpEncryption::
-	See linkgit:git-send-email[1] for description.  Note that this
-	setting is not subject to the 'identity' mechanism.
-
 sendemail.smtpssl (deprecated)::
 	Deprecated alias for 'sendemail.smtpEncryption = ssl'.
 
@@ -2933,6 +2929,7 @@ sendemail.suppresscc::
 sendemail.suppressFrom::
 sendemail.to::
 sendemail.smtpDomain::
+sendemail.smtpEncryption::
 sendemail.smtpServer::
 sendemail.smtpServerPort::
 sendemail.smtpServerOption::
-- 
2.13.2




  parent reply	other threads:[~2017-07-08 20:40 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-08 20:34 [PATCH 0/4] Misc. documentation fixes astian
2017-07-08 20:34 ` [PATCH 1/4] Doc/config.txt: explain repeated sections astian
2017-07-08 23:03   ` Junio C Hamano
2017-07-09  7:57     ` Junio C Hamano
2017-07-10  7:32       ` Jeff King
2017-07-10 16:17         ` Junio C Hamano
2017-07-08 20:34 ` [PATCH 2/4] Doc/config.txt: fix typos astian
2017-07-08 20:34 ` [PATCH 3/4] Doc/git-send-email.txt: clarify a couple of options astian
2017-07-08 20:34 ` astian [this message]
2017-07-08 23:09   ` [PATCH 4/4] Doc/config.txt: fix documentation for smtpEncryption 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=20170708203413.16442-5-astian@eclipso.at \
    --to=astian@eclipso.at \
    --cc=git@vger.kernel.org \
    /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).