# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1290455142 -3600
# Node ID b8755285ff1805a89557271070ac78cfe3b4289d
# Parent  c333552ec003b620cc38a7e2ee8c745d8b13e704# Parent  2cadbd48a31b12407dec5bba1a8e43cbcbd6a1b3
Merge with default

diff -r c333552ec003 -r b8755285ff18 hgkw/keyword.py
--- a/hgkw/keyword.py	Tue Nov 16 10:33:19 2010 +0900
+++ b/hgkw/keyword.py	Mon Nov 22 20:45:42 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