# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1245325399 -3600
# Node ID a5db6cec7863b64a9d6e708dd875868a27d00060
# Parent  0cdbdf79d5e9a30d90ced727a9cbfcb65ee4e5c9# Parent  1dc66cff9dd55b4cec1e7dae1ff8d02d0cc6d627
(stable) merge

diff -r 0cdbdf79d5e9 -r a5db6cec7863 hgkw/keyword.py
--- a/hgkw/keyword.py	Mon Jun 15 00:03:26 2009 +0200
+++ b/hgkw/keyword.py	Thu Jun 18 12:43:19 2009 +0100
@@ -32,7 +32,7 @@
 #
 # Run "hg help keyword" and "hg kwdemo" to get info on configuration.
 
-'''keyword expansion in local repositories
+'''keyword expansion in tracked files
 
 This extension expands RCS/CVS-like or self-customized $Keywords$ in
 tracked text files selected by your configuration.
diff -r 0cdbdf79d5e9 -r a5db6cec7863 tests/test-keyword.out
--- a/tests/test-keyword.out	Mon Jun 15 00:03:26 2009 +0200
+++ b/tests/test-keyword.out	Thu Jun 18 12:43:19 2009 +0100
@@ -1,5 +1,5 @@
 % help
-keyword extension - keyword expansion in local repositories
+keyword extension - keyword expansion in tracked files
 
 This extension expands RCS/CVS-like or self-customized $Keywords$ in
 tracked text files selected by your configuration.
@@ -55,7 +55,7 @@
 
 enabled extensions:
 
- keyword   keyword expansion in local repositories
+ keyword   keyword expansion in tracked files
  mq        patch management and development
  notify    hook extension to email notifications on commits/pushes