Re: [PATCH 4/4] Doc/config.txt: fix documentation for smtpEncryption

2017-07-08 Thread Junio C Hamano
astian  writes:

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

Hmph, does anybody know when this stopped being true, or was it
incorrect from the very beginning?

>
> Signed-off-by: astian 
> ---
>  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::


[PATCH 4/4] Doc/config.txt: fix documentation for smtpEncryption

2017-07-08 Thread astian
Stop saying that smtpEncryption (a configuration variable used by
git-send-email) is not usable in "sendemail." subsections,
because that's false.

Signed-off-by: astian 
---
 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