# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 2010-01-29 00:04:38
# Node ID 61f4ea277f237bc966149398618f53c9479f69e4
# Parent  08a0f04b56bd3061d2fe5e639be0d00b6da7e71b
# Parent  b08ffd27dfc844eb46bccd38b0775a377c0153f2

Merge with stable.

diff --git a/doc/hgrc.5.txt b/doc/hgrc.5.txt
--- a/doc/hgrc.5.txt
+++ b/doc/hgrc.5.txt
@@ -305,7 +305,7 @@ 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).
diff --git a/hgext/patchbomb.py b/hgext/patchbomb.py
--- a/hgext/patchbomb.py
+++ b/hgext/patchbomb.py
@@ -35,6 +35,9 @@ 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.