diff hgext/keyword.py @ 13028:687006f06e00

merge with stable
author Martin Geisler <mg@aragost.com>
date Mon, 22 Nov 2010 17:39:46 +0100
parents edbe32efc89f 99210fb3bc0a
children 8c6b7a5f38c4
line wrap: on
line diff
--- 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