[PATCH 2 of 2] keyword: s/config/configuration/ in kwdemo output and doc strings

Christian Ebert blacktrash at gmx.net
Tue Jul 21 05:24:08 CDT 2009


# HG changeset patch
# User Christian Ebert <blacktrash at gmx.net>
# Date 1248171802 -3600
# Node ID 2add0d523a56cc89c7443ac2a736f04dec8b9b19
# Parent  f713de0058b6f0c7e21a9c97936158ed1fa9d97b
keyword: s/config/configuration/ in kwdemo output and doc strings

diff --git a/hgext/keyword.py b/hgext/keyword.py
--- a/hgext/keyword.py
+++ b/hgext/keyword.py
@@ -55,7 +55,7 @@
 
 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.
+results of your configuration changes.
 
 Before changing/disabling active keywords, run "hg kwshrink" to avoid the risk
 of inadvertently storing expanded keywords in the change history.
@@ -318,9 +318,9 @@
         if k.endswith('keyword'):
             extension = '%s = %s' % (k, v)
             break
-    msg = {'current': _('config using current keyword template maps'),
-           'custom': _('config using custom keyword template maps'),
-           'default': _('config using default keyword template maps')
+    msg = {'current': _('configuration using current keyword template maps'),
+           'custom': _('configuration using custom keyword template maps'),
+           'default': _('configuration using default keyword template maps')
            }[kwstatus]
     ui.status('\n\t%s\n' % msg)
     ui.write('[extensions]\n%s\n' % extension)
@@ -347,7 +347,7 @@
             repo.ui.setconfig('hooks', name, '')
     ui.note(_('unhooked all commit hooks\n'))
     ui.note('hg -R "%s" ci -m "%s"\n' % (tmpdir, msg))
-    msg = _('hg keyword config and expansion example')
+    msg = _('hg keyword configuration and expansion example')
     repo.commit(text=msg)
     if ui.verbose:
         msg = {'current': _('current keywords expanded in %s') % path,
@@ -426,7 +426,7 @@
 
 
 def uisetup(ui):
-    '''Collects [keyword] config in kwtools.
+    '''Collects [keyword] configuration in kwtools.
     Monkeypatches dispatch._parse if needed.'''
 
     for pat, opt in ui.configitems('keyword'):
diff --git a/tests/test-keyword.out b/tests/test-keyword.out
--- a/tests/test-keyword.out
+++ b/tests/test-keyword.out
@@ -28,7 +28,7 @@
 
 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.
+results of your configuration changes.
 
 Before changing/disabling active keywords, run "hg kwshrink" to avoid the risk
 of inadvertently storing expanded keywords in the change history.
@@ -265,7 +265,7 @@
 demo.txt = 
 [keywordmaps]
 Xinfo = {author}: {desc}
-$Xinfo: test: hg keyword config and expansion example $
+$Xinfo: test: hg keyword configuration and expansion example $
 % cat
 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 do not process $Id:


More information about the Mercurial-devel mailing list