# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1248375623 -3600
# Node ID f27b8d46e708169ad6903c66ae2e24df16dd7df9
# Parent  f9e8e4992b7ead654c777895d607f8a7c8b78ac5# Parent  6e73db2016ab3c391225ca9f4fb1deb44a5c3063
(stable) merge

diff -r f9e8e4992b7e -r f27b8d46e708 hgkw/keyword.py
--- a/hgkw/keyword.py	Thu Jul 09 23:59:03 2009 +0200
+++ b/hgkw/keyword.py	Thu Jul 23 20:00:23 2009 +0100
@@ -372,11 +372,12 @@
     Use -u/--untracked to list untracked files as well.
 
     With -a/--all and -v/--verbose the codes used to show the status of files
-    are:
-    K = keyword expansion candidate
-    k = keyword expansion candidate (untracked)
-    I = ignored
-    i = ignored (untracked)
+    are::
+
+      K = keyword expansion candidate
+      k = keyword expansion candidate (untracked)
+      I = ignored
+      i = ignored (untracked)
     '''
     kwt = kwtools['templater']
     status = _status(ui, repo, kwt, opts.get('untracked'), *pats, **opts)
@@ -527,7 +528,7 @@
     'kwdemo':
         (demo,
          [('d', 'default', None, _('show default keyword template maps')),
-          ('f', 'rcfile', [], _('read maps from rcfile'))],
+          ('f', 'rcfile', '', _('read maps from rcfile'))],
          _('hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]...')),
     'kwexpand': (expand, commands.walkopts,
                  _('hg kwexpand [OPTION]... [FILE]...')),