--- a/tests/test-keyword.out	Sat Jul 21 09:41:13 2007 +0200
+++ b/tests/test-keyword.out	Sat Jul 21 21:44:33 2007 +0200
@@ -1,42 +1,40 @@
 % help
 keyword extension - keyword expansion in local repositories
 This extension expands RCS/CVS-like or self-customized $Keywords$
-in the text files selected by your configuration.
-Keywords are only expanded in local repositories and not logged by
-Mercurial internally. The mechanism can be regarded as a convenience
-for the current user or archive distribution.
-Configuration is done in the [keyword] and [keywordmaps] sections of
-hgrc files.
+in tracked text files selected by your configuration.
+Keywords are only expanded in local repositories and not stored in
+the change history. The mechanism can be regarded as a convenience
+for the current user or for archive distribution.
+Configuration is done in the [keyword] and [keywordmaps] sections
+of hgrc files.
 Example:
-    [extensions]
-    hgext.keyword =
     [keyword]
     # expand keywords in every python file except those matching "x*"
     **.py =
-    x* = ignore
-Note: the more specific you are in your [keyword] filename patterns
+    x*    = ignore
+Note: the more specific you are in your filename patterns
       the less you lose speed in huge repos.
-For a [keywordmaps] template mapping and expansion demonstration
-run "hg kwdemo".
+For [keywordmaps] template mapping and expansion demonstration and
+control run "hg kwdemo".
 An additional date template filter {date|utcdate} is provided.
-You can replace the default template mappings with customized keywords
-and templates of your choice.
+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.
-When you change keyword configuration, especially the active keywords,
-and do not want to store expanded keywords in change history, run
-"hg kwshrink", and then change configuration.
-Expansions spanning more than one line and incremental exapansions
-(like CVS' $Log$) are not supported. A keyword template map
+Before changing/disabling active keywords, run "hg kwshrink" to avoid
+the risk of inadvertedly storing expanded keywords in the change history.
+Expansions spanning more than one line and incremental expansions,
+like CVS' $Log$, are not supported. A keyword template map
 "Log = {desc}" expands to the first line of the changeset description.
 Caveat: "hg import" fails if the patch context contains an active
         keyword. In that case run "hg kwshrink", reimport, and then
         "hg kwexpand".
         Or, better, use bundle/unbundle to share changes.
-list of commands (use "hg help -v keyword" to show aliases and global options):
  kwdemo     print [keywordmaps] configuration and an expansion example
  kwexpand   expand keywords in working directory
  kwshrink   revert expanded keywords in working directory
 % hg kwdemo
+[extensions]
+hgext.keyword = 
 [keyword]
 demo.txt =
 [keywordmaps]
@@ -100,6 +98,8 @@
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 % custom keyword expansion
 % try with kwdemo
+[extensions]
+hgext.keyword = 
 [keyword]
 demo.txt =
 [keywordmaps]