# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 2010-11-22 16:39:46
# Node ID 687006f06e00ae1953a6d30e3ac52f80f5c2519b
# Parent  7f2ecb64140d821ff5e3827d211aa9ee778a2acf
# Parent  99210fb3bc0a94dfe1b8a81825faa367ca98a128

merge with stable

diff --git a/hgext/keyword.py b/hgext/keyword.py
--- a/hgext/keyword.py
+++ b/hgext/keyword.py
@@ -68,7 +68,7 @@ Three additional date template filters a
 
 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