Merge branch 'mh/maint-sendmail-cc-doc' into maint

* mh/maint-sendmail-cc-doc:
  doc/git-send-email: mention sendemail.cc config variable

diff --combined Documentation/git-send-email.txt
index b69846e522fdcf07360b51b8d9f8af56fbecaa65,2b6d68c498a1afac3f25b2d9c1115057add805b4..ff4aeff4e6d1df6840b500dafb19fc97e2197d68
--- 1/Documentation/git-send-email.txt
--- 2/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@@ -34,6 -34,7 +34,7 @@@ The --bcc option must be repeated for e
  
  --cc::
        Specify a starting "Cc:" value for each email.
+       Default is the value of 'sendemail.cc'.
  +
  The --cc option must be repeated for each user you want on the cc list.
  
@@@ -197,6 -198,12 +198,6 @@@ Administerin
  --[no-]validate::
        Perform sanity checks on patches.
        Currently, validation means the following:
 -
 ---[no-]format-patch::
 -      When an argument may be understood either as a reference or as a file name,
 -      choose to understand it as a format-patch argument ('--format-patch')
 -      or as a file name ('--no-format-patch'). By default, when such a conflict
 -      occurs, git send-email will fail.
  +
  --
                *       Warn of patches that contain lines longer than 998 characters; this
@@@ -206,12 -213,6 +207,12 @@@
  Default is the value of 'sendemail.validate'; if this is not set,
  default to '--validate'.
  
 +--[no-]format-patch::
 +      When an argument may be understood either as a reference or as a file name,
 +      choose to understand it as a format-patch argument ('--format-patch')
 +      or as a file name ('--no-format-patch'). By default, when such a conflict
 +      occurs, git send-email will fail.
 +
  
  CONFIGURATION
  -------------