Merge branches 'maint' and 'jc/http'

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 8c58685e280614238143f50df5f97f0777c0470f..481b3f50e3d690f5cd47ffa2c2d8bb645114e315 100644 (file)
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -24,9 +24,16 @@ OPTIONS
 -------
 The options available are:
 
+--bcc::
+       Specify a "Bcc:" value for each email.
+
+       The --bcc option must be repeated for each user you want on the bcc list.
+
 --cc::
        Specify a starting "Cc:" value for each email.
 
+       The --cc option must be repeated for each user you want on the cc list.
+
 --chain-reply-to, --no-chain-reply-to::
        If this is set, each email will be sent as a reply to the previous
        email sent.  If disabled with "--no-chain-reply-to", all emails after
@@ -52,7 +59,7 @@ The options available are:
        is not set, this will be prompted for.
 
 --no-signed-off-by-cc::
-       Do not add emails foudn in Signed-off-by: lines to the cc list.
+       Do not add emails found in Signed-off-by: lines to the cc list.
 
 --quiet::
        Make git-send-email less verbose.  One line per email should be
@@ -76,6 +83,8 @@ The options available are:
        Generally, this will be the upstream maintainer of the
        project involved.
 
+       The --to option must be repeated for each user you want on the to list.
+
 
 Author
 ------