Merge with stable.

doc/hgrc.5.txt

@@ -305,7 +305,7 b' Settings for extensions that send email '
     email addresses.
 ``bcc``
     Optional. Comma-separated list of blind carbon copy recipients'
-    email addresses. Cannot be set interactively.
+    email addresses.
 ``method``
     Optional. Method to use to send email messages. If value is ``smtp``
     (default), use SMTP (see the SMTP_ section for configuration).

hgext/patchbomb.py

@@ -35,6 +35,9 b' file::'
   cc = cc1, cc2, ...
   bcc = bcc1, bcc2, ...
 
+Use ``[patchbomb]`` as configuration section name if you need to
+override global ``[email]`` address settings.
+
 Then you can use the "hg email" command to mail a series of changesets
 as a patchbomb.