Merge branch 'aw/doc-smtp-ssl-cert-path'

A long overdue documentation update to match an age-old code
update.

* aw/doc-smtp-ssl-cert-path:
correct smtp-ssl-cert-path description

diff --combined Documentation/git-send-email.txt
index e04849e3961257500f86441611e738e9b4d0f330,21d2670496a9295da36975036f24100f3cc62f8b..f248a8665e1f775edb6932af69b68b7081e1687c
--- 1/Documentation/git-send-email.txt
--- 2/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@@ -20,7 -20,7 +20,7 @@@ files in the directory), or directly a
  last case, any format accepted by linkgit:git-format-patch[1] can
  be passed to git send-email.
  
 -The header of the email is configurable by command line options.  If not
 +The header of the email is configurable via command-line options.  If not
  specified on the command line, the user will be prompted with a ReadLine
  enabled interface to provide the necessary information.
  
@@@ -68,7 -68,7 +68,7 @@@ The --cc option must be repeated for ea
  When '--compose' is used, git send-email will use the From, Subject, and
  In-Reply-To headers specified in the message. If the body of the message
  (what you type after the headers and a blank line) only contains blank
 -(or Git: prefixed) lines the summary won't be sent, but From, Subject,
 +(or Git: prefixed) lines, the summary won't be sent, but From, Subject,
  and In-Reply-To headers will be used unless they are removed.
  +
  Missing From or In-Reply-To headers will be prompted for.
@@@ -78,7 -78,7 +78,7 @@@ See the CONFIGURATION section for 'send
  --from=<address>::
        Specify the sender of the emails.  If not specified on the command line,
        the value of the 'sendemail.from' configuration option is used.  If
 -      neither the command line option nor 'sendemail.from' are set, then the
 +      neither the command-line option nor 'sendemail.from' are set, then the
        user will be prompted for the value.  The default for the prompt will be
        the value of GIT_AUTHOR_IDENT, or GIT_COMMITTER_IDENT if that is not
        set, as returned by "git var -l".
@@@ -131,21 -131,6 +131,21 @@@ Note that no attempts whatsoever are ma
        Specify encoding of compose message. Default is the value of the
        'sendemail.composeencoding'; if that is unspecified, UTF-8 is assumed.
  
 +--transfer-encoding=(7bit|8bit|quoted-printable|base64)::
 +      Specify the transfer encoding to be used to send the message over SMTP.
 +      7bit will fail upon encountering a non-ASCII message.  quoted-printable
 +      can be useful when the repository contains files that contain carriage
 +      returns, but makes the raw patch email file (as saved from a MUA) much
 +      harder to inspect manually.  base64 is even more fool proof, but also
 +      even more opaque.  Default is the value of the 'sendemail.transferEncoding'
 +      configuration value; if that is unspecified, git will use 8bit and not
 +      add a Content-Transfer-Encoding header.
 +
 +--xmailer::
 +--no-xmailer::
 +      Add (or prevent adding) the "X-Mailer:" header.  By default,
 +      the header is added, but it can be turned off by setting the
 +      `sendemail.xmailer` configuration variable to `false`.
  
  Sending
  ~~~~~~~
@@@ -214,10 -199,15 +214,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';
@@@ -263,18 -253,6 +268,18 @@@ Automatin
        cc list. Default is the value of 'sendemail.signedoffbycc' configuration
        value; if that is unspecified, default to --signed-off-by-cc.
  
 +--[no-]cc-cover::
 +      If this is set, emails found in Cc: headers in the first patch of
 +      the series (typically the cover letter) are added to the cc list
 +      for each email set. Default is the value of 'sendemail.cccover'
 +      configuration value; if that is unspecified, default to --no-cc-cover.
 +
 +--[no-]to-cover::
 +      If this is set, emails found in To: headers in the first patch of
 +      the series (typically the cover letter) are added to the to list
 +      for each email set. Default is the value of 'sendemail.tocover'
 +      configuration value; if that is unspecified, default to --no-to-cover.
 +
  --suppress-cc=<category>::
        Specify an additional category of recipients to suppress the
        auto-cc of: