# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1245773564 -7200
# Node ID 58569d4d0aec7be02cf14043d3265a434fda9c19
# Parent  d5882243b1f97fb023b1da71a17ec9e682e879d7# Parent  763d20224433257e8e9f15e2175737a69683e3d5
Merge with stable

diff -r d5882243b1f9 -r 58569d4d0aec hgkw/keyword.py
--- a/hgkw/keyword.py	Sun Jun 21 23:17:37 2009 +0100
+++ b/hgkw/keyword.py	Tue Jun 23 18:12:44 2009 +0200
@@ -26,7 +26,7 @@
 #
 # Run "hg help keyword" and "hg kwdemo" to get info on configuration.
 
-'''keyword expansion in tracked files
+'''expand keywords in tracked files
 
 This extension expands RCS/CVS-like or self-customized $Keywords$ in
 tracked text files selected by your configuration.
diff -r d5882243b1f9 -r 58569d4d0aec tests/test-keyword.out
--- a/tests/test-keyword.out	Sun Jun 21 23:17:37 2009 +0100
+++ b/tests/test-keyword.out	Tue Jun 23 18:12:44 2009 +0200
@@ -1,5 +1,5 @@
 % help
-keyword extension - keyword expansion in tracked files
+keyword extension - expand keywords in tracked files
 
 This extension expands RCS/CVS-like or self-customized $Keywords$ in
 tracked text files selected by your configuration.
@@ -55,9 +55,9 @@
 
 enabled extensions:
 
- keyword   keyword expansion in tracked files
- mq        patch management and development
- notify    hook extension to email notifications on commits/pushes
+ keyword   expand keywords in tracked files
+ mq        work with a stack of patches
+ notify    send e-mail notifications for commits/pushes
 
 use "hg -v help keyword" to show aliases and global options
 % hg kwdemo