Merge with stable.
authorMartin Geisler <mg@lazybytes.net>
Fri, 29 Jan 2010 01:04:38 +0100
changeset 10285 61f4ea277f23
parent 10282 08a0f04b56bd (current diff)
parent 10284 b08ffd27dfc8 (diff)
child 10286 cc0340ef47f7
Merge with stable.
doc/hgrc.5.txt
hgext/patchbomb.py
--- a/doc/hgrc.5.txt	Mon Jan 25 00:05:27 2010 -0600
+++ b/doc/hgrc.5.txt	Fri Jan 29 01:04:38 2010 +0100
@@ -305,7 +305,7 @@
     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).
--- a/hgext/patchbomb.py	Mon Jan 25 00:05:27 2010 -0600
+++ b/hgext/patchbomb.py	Fri Jan 29 01:04:38 2010 +0100
@@ -35,6 +35,9 @@
   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.