# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1283441300 -7200
# Node ID e59156a1316f1d4e210eda6b694ccea1a47fce74
# Parent  cc5b7184014836d89518b06d74f1ce9202061ff3# Parent  4d12c42fe93204dceff07b94cc90791442bb85f1
merge with stable

diff -r cc5b71840148 -r e59156a1316f hgext/bookmarks.py
--- a/hgext/bookmarks.py	Thu Sep 02 14:45:16 2010 +0200
+++ b/hgext/bookmarks.py	Thu Sep 02 17:28:20 2010 +0200
@@ -451,8 +451,8 @@
                 ui.status(_("deleting remote bookmark %s\n") % b)
                 new = '' # delete
             else:
-                ui.warn(_('bookmark %s does not exist on the local'
-                          ' or remote repository!\n') % b)
+                ui.warn(_('bookmark %s does not exist on the local '
+                          'or remote repository!\n') % b)
                 return 2
             old = rb.get(b, '')
             r = other.pushkey('bookmarks', b, old, new)
diff -r cc5b71840148 -r e59156a1316f mercurial/help.py
--- a/mercurial/help.py	Thu Sep 02 14:45:16 2010 +0200
+++ b/mercurial/help.py	Thu Sep 02 17:28:20 2010 +0200
@@ -83,7 +83,7 @@
     return loader
 
 helptable = [
-    (["config"], _("Configuration Files"), loaddoc('config')),
+    (["config", "hgrc"], _("Configuration Files"), loaddoc('config')),
     (["dates"], _("Date Formats"), loaddoc('dates')),
     (["patterns"], _("File Name Patterns"), loaddoc('patterns')),
     (['environment', 'env'], _('Environment Variables'),