# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1301653319 -7200
# Node ID 80664e245f84e2dfd5c75d124f65644fa14eaf35
# Parent  22f20d0fe2d37709a0b3ce3bf8fde2c49ad0c1f9# Parent  8d960240faac1b906d4529989df62a4bce144055
merge with stable

diff -r 22f20d0fe2d3 -r 80664e245f84 hgext/patchbomb.py
--- a/hgext/patchbomb.py	Fri Apr 01 12:09:11 2011 +0200
+++ b/hgext/patchbomb.py	Fri Apr 01 12:21:59 2011 +0200
@@ -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>
diff -r 22f20d0fe2d3 -r 80664e245f84 mercurial/help/hgweb.txt
--- a/mercurial/help/hgweb.txt	Fri Apr 01 12:09:11 2011 +0200
+++ b/mercurial/help/hgweb.txt	Fri Apr 01 12:21:59 2011 +0200
@@ -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::