merge with i18n stable 1.8.2
authorMatt Mackall <mpm@selenic.com>
Fri, 01 Apr 2011 11:45:07 -0500
branchstable
changeset 13844 b032bec2c0a6
parent 13839 8d960240faac (diff)
parent 13843 2347feb35691 (current diff)
child 13845 ddcb57a2eaeb
child 13846 542fa0290298
child 13851 7fb7571efc61
merge with i18n
--- a/hgext/patchbomb.py	Fri Apr 01 07:53:15 2011 -0300
+++ b/hgext/patchbomb.py	Fri Apr 01 11:45:07 2011 -0500
@@ -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	Fri Apr 01 07:53:15 2011 -0300
+++ b/mercurial/help/hgweb.txt	Fri Apr 01 11:45:07 2011 -0500
@@ -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::