Mercurial > hg > mercurial-source
changeset 13840:80664e245f84
merge with stable
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Fri, 01 Apr 2011 12:21:59 +0200 |
| parents | 22f20d0fe2d3 (current diff) 8d960240faac (diff) |
| children | 367805c848e5 |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/patchbomb.py +++ b/hgext/patchbomb.py @@ -22,8 +22,8 @@ and References headers, so they will show up as a sequence in threaded mail and news readers, and in mail archives. -To configure other defaults, add a section like this to your hgrc -file:: +To configure other defaults, add a section like this to your +configuration file:: [email] from = My Name <my@email>
--- a/mercurial/help/hgweb.txt +++ b/mercurial/help/hgweb.txt @@ -3,15 +3,16 @@ configuration file can be used to specify the repository paths to use and global web configuration options. -This file uses the same syntax as hgrc configuration files, but only -the following sections are recognized: +This file uses the same syntax as other Mercurial configuration files, +but only the following sections are recognized: - web - paths - collections The ``web`` section can specify all the settings described in the web -section of the hgrc documentation. +section of the hgrc(5) documentation. See :hg:`help config` for +information on where to find the manual page. The ``paths`` section provides mappings of physical repository paths to virtual ones. For instance::