Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Tue, 09 Jun 2009 22:42:39 +0200
changeset 576 b21f76520d40
parent 572 098d7464c8e4 (current diff)
parent 573 197aeca9108a (diff)
child 578 b9b551e18502
Merge with stable
--- a/hgkw/keyword.py	Tue Jun 09 10:34:01 2009 +0200
+++ b/hgkw/keyword.py	Tue Jun 09 22:42:39 2009 +0200
@@ -280,7 +280,7 @@
     '''print [keywordmaps] configuration and an expansion example
 
     Show current, custom, or default keyword template maps and their
-    expansion.
+    expansions.
 
     Extend current configuration by specifying maps as arguments and
     optionally by reading from an additional hgrc file.
@@ -358,7 +358,7 @@
     shutil.rmtree(tmpdir, ignore_errors=True)
 
 def expand(ui, repo, *pats, **opts):
-    '''expand keywords in working directory
+    '''expand keywords in the working directory
 
     Run after (re)enabling keyword expansion.
 
@@ -390,7 +390,7 @@
             ui.write(fmt % repo.pathto(f, cwd))
 
 def shrink(ui, repo, *pats, **opts):
-    '''revert expanded keywords in working directory
+    '''revert expanded keywords in the working directory
 
     Run before changing/disabling active keywords or if you experience
     problems with "hg import" or "hg merge".
--- a/tests/test-keyword.out	Tue Jun 09 10:34:01 2009 +0200
+++ b/tests/test-keyword.out	Tue Jun 09 22:42:39 2009 +0200
@@ -49,9 +49,9 @@
 list of commands:
 
  kwdemo     print [keywordmaps] configuration and an expansion example
- kwexpand   expand keywords in working directory
+ kwexpand   expand keywords in the working directory
  kwfiles    print files currently configured for keyword expansion
- kwshrink   revert expanded keywords in working directory
+ kwshrink   revert expanded keywords in the working directory
 
 enabled extensions: