# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1243813910 -7200
# Node ID 3b4b797ba69db04564b40120f57ae52483b21436
# Parent  baee5f7bfd32260caeb6a1f1da40d208b80ea971# Parent  2fc480f3e148704cd745f8e25c6fab8fe356e3c3
Merge with stable

diff -r baee5f7bfd32 -r 3b4b797ba69d hgkw/keyword.py
--- a/hgkw/keyword.py	Wed May 27 20:34:38 2009 +0200
+++ b/hgkw/keyword.py	Mon Jun 01 01:51:50 2009 +0200
@@ -66,7 +66,7 @@
 kwdemo" to control the results of your config changes.
 
 Before changing/disabling active keywords, run "hg kwshrink" to avoid
-the risk of inadvertedly storing expanded keywords in the change
+the risk of inadvertently storing expanded keywords in the change
 history.
 
 To force expansion after enabling it, or a configuration change, run
diff -r baee5f7bfd32 -r 3b4b797ba69d tests/test-keyword.out
--- a/tests/test-keyword.out	Wed May 27 20:34:38 2009 +0200
+++ b/tests/test-keyword.out	Mon Jun 01 01:51:50 2009 +0200
@@ -31,7 +31,7 @@
 kwdemo" to control the results of your config changes.
 
 Before changing/disabling active keywords, run "hg kwshrink" to avoid
-the risk of inadvertedly storing expanded keywords in the change
+the risk of inadvertently storing expanded keywords in the change
 history.
 
 To force expansion after enabling it, or a configuration change, run