diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-10-31 04:04:42 +0300 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-31 04:04:42 +0300 |
| commit | 576b19924ebda9075512f8fd95fb2996cbe871b4 (patch) | |
| tree | 652640f58f9ec9014cb5735bb9909155b2c82761 | |
| parent | 160314e62537274d88c939bed957f623cda13da4 (diff) | |
| parent | a2634646eba81923b66fa752535e24969be2fa82 (diff) | |
Merge branch 'sd/doc-smtp-encryption'
* sd/doc-smtp-encryption:
docs: git-send-email: difference between ssl and tls smtp-encryption
| -rw-r--r-- | Documentation/git-send-email.txt | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 3290043053a..765b2df8530 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`. --smtp-domain=<FQDN>:: Specifies the Fully Qualified Domain Name (FQDN) used in the |