merge with stable
authorMartin Geisler <mg@aragost.com>
Mon, 22 Nov 2010 17:39:46 +0100
changeset 13028 687006f06e00
parent 13027 7f2ecb64140d (current diff)
parent 13025 99210fb3bc0a (diff)
child 13029 f930032aa6d5
merge with stable
hgext/keyword.py
--- a/hgext/keyword.py	Thu Nov 18 19:20:21 2010 -0500
+++ b/hgext/keyword.py	Mon Nov 22 17:39:46 2010 +0100
@@ -68,7 +68,7 @@
 
 The default template mappings (view with :hg:`kwdemo -d`) can be
 replaced with customized keywords and templates. Again, run
-:hg:`kwdemo` to control the results of your config changes.
+:hg:`kwdemo` to control the results of your configuration changes.
 
 Before changing/disabling active keywords, run :hg:`kwshrink` to avoid
 the risk of inadvertently storing expanded keywords in the change