summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorAdam Williamson <awilliam@redhat.com>2015-01-06 11:01:00 -0800
committerJunio C Hamano <gitster@pobox.com>2015-01-07 10:39:49 -0800
commitbcfe6f327d7a3ec64aca60beef377f5ada0c9b96 (patch)
treeb1b29dd8d61ce2e9673b6fc14127ca02d765e373 /Documentation
parent9a8c2b67cd5a51666f2c0ce3fbbdb08b97b79b3d (diff)
downloadgit-bcfe6f327d7a3ec64aca60beef377f5ada0c9b96.tar.gz
correct smtp-ssl-cert-path descriptionaw/doc-smtp-ssl-cert-path
The git-send-email documentation was never updated to reflect the change made in 01645b74 to use the SSL library's default CA trust store rather than /etc/ssl/certs as a hardcoded default CApath. This corrects that, and also tweaks the rest of the text a bit to explain more accurately what is required for a valid CApath / CAfile. Signed-off-by: Adam Williamson <awilliam@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-send-email.txt13
1 files changed, 9 insertions, 4 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index f0e57a597b..21d2670496 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -199,10 +199,15 @@ must be used for each option.
Legacy alias for '--smtp-encryption ssl'.
--smtp-ssl-cert-path::
- Path to ca-certificates (either a directory or a single file).
- Set it to an empty string to disable certificate verification.
- Defaults to the value set to the 'sendemail.smtpsslcertpath'
- configuration variable, if set, or `/etc/ssl/certs` otherwise.
+ Path to a store of trusted CA certificates for SMTP SSL/TLS
+ certificate validation (either a directory that has been processed
+ by 'c_rehash', or a single file containing one or more PEM format
+ certificates concatenated together: see verify(1) -CAfile and
+ -CApath for more information on these). Set it to an empty string
+ to disable certificate verification. Defaults to the value of the
+ 'sendemail.smtpsslcertpath' configuration variable, if set, or the
+ backing SSL library's compiled-in default otherwise (which should
+ be the best choice on most platforms).
--smtp-user=<user>::
Username for SMTP-AUTH. Default is the value of 'sendemail.smtpuser';