Subject: Re: [PATCH v3] docs: git-send-email: difference between ssl and tls smtp-encryption

From: Junio C Hamano <[email-masked]>
Date: Wed, 12 Oct 2022 14:38:17 -0700

"brian m. carlson" <[email-masked]> writes:

> On 2022-10-12 at 15:06:19, [email-masked] wrote:
>> diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
>> index 3290043053..765b2df853 100644
>> --- a/Documentation/git-send-email.txt
>> +++ b/Documentation/git-send-email.txt
>> @@ -178,9 +178,18 @@ Sending
>>  	for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH.
>>  
>>  --smtp-encryption=<encryption>::
>> -	Specify the encryption to use, either 'ssl' or 'tls'.  Any other
>> -	value reverts to plain SMTP.  Default is the value of
>> -	`sendemail.smtpEncryption`.
>> +	Specify in what way encrypting begins for the SMTP connection.
>> +	Valid values are 'ssl' and 'tls'. Any other value reverts to plain
>> +	(unencrypted) SMTP, which defaults to port 25.
>> +	Despite the names, both values will use the same newer version of TLS,
>> +	but for historic reasons have these names. 'ssl' refers to "implicit"
>> +	encryption (sometimes called SMTPS), that uses port 465 by default.
>> +	'tls' refers to "explicit" encryption (often known as STARTTLS),
>> +	that uses port 25 by default. Other ports might be used by the SMTP
>> +	server, which are not the default. Commonly found alternative port for
>> +	'tls' and unencrypted is 587. You need to check your provider's
>> +	documentation or your server configuration to make sure
>> +	for your own case. Default is the value of `sendemail.smtpEncryption`.
>
> I'm happy with this as it stands.  Thanks for taking my suggestions and
> sending a patch to improve the docs.

I marked it as "Expecting a reroll" in the latest issue of "What's
cooking" report, but I do not mind taking it to 'next' as-is,
without adding an extra reference to --smtp-server-port.  The
reference to port numbers here are there to help readers identify
which one is which, not because it is common to use randomly
numbered ports.

Thanks.