Skip to content

Commit a263464

Browse files
Sotir Danailovgitster
authored andcommitted
docs: git-send-email: difference between ssl and tls smtp-encryption
New explanation for the difference between these values. It's hard to understand what they do based only on the names. New description of used default ports. Signed-off-by: Sotir Danailov <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3dcec76 commit a263464

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

Documentation/git-send-email.txt

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,18 @@ Sending
178178
for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH.
179179

180180
--smtp-encryption=<encryption>::
181-
Specify the encryption to use, either 'ssl' or 'tls'. Any other
182-
value reverts to plain SMTP. Default is the value of
183-
`sendemail.smtpEncryption`.
181+
Specify in what way encrypting begins for the SMTP connection.
182+
Valid values are 'ssl' and 'tls'. Any other value reverts to plain
183+
(unencrypted) SMTP, which defaults to port 25.
184+
Despite the names, both values will use the same newer version of TLS,
185+
but for historic reasons have these names. 'ssl' refers to "implicit"
186+
encryption (sometimes called SMTPS), that uses port 465 by default.
187+
'tls' refers to "explicit" encryption (often known as STARTTLS),
188+
that uses port 25 by default. Other ports might be used by the SMTP
189+
server, which are not the default. Commonly found alternative port for
190+
'tls' and unencrypted is 587. You need to check your provider's
191+
documentation or your server configuration to make sure
192+
for your own case. Default is the value of `sendemail.smtpEncryption`.
184193

185194
--smtp-domain=<FQDN>::
186195
Specifies the Fully Qualified Domain Name (FQDN) used in the

0 commit comments

Comments
 (0)