merge with stable

hgext/bookmarks.py

@@ -451,8 +451,8 b' def push(oldpush, ui, repo, dest=None, *'
                 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)

mercurial/help.py

@@ -83,7 +83,7 b' def loaddoc(topic):'
     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'),