This clarifies the meaning of the 'ssl' and 'tls' values for this option, which respectively enable SSL/TLS, i.e. a standard "modern" SSL approach; and STARTTLS, i.e. opportunistic in-band TLS. Signed-off-by: Drew DeVault <sir@xxxxxxxxx> --- Documentation/git-send-email.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 93708aefea..c17c3b400a 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -168,8 +168,11 @@ Sending unspecified, choosing the envelope sender is left to your MTA. --smtp-encryption=<encryption>:: - Specify the encryption to use, either 'ssl' or 'tls'. Any other - value reverts to plain SMTP. Default is the value of + Specify the encryption to use, either 'ssl' or 'tls'. 'ssl' enables + generic SSL/TLS support and is typically used on port 465. 'tls' + enables in-band STARTTLS support and is typically used on port 25 or + 587. Use whichever option is recommended by your mail provider. Any + other value reverts to plain SMTP. Default is the value of `sendemail.smtpEncryption`. --smtp-domain=<FQDN>:: -- 2.31.1
