diff mercurial/commands.py @ 7210:833d1250ce00

help: update help make help description 'topic'-oriented rather than 'command'-oriented change 'special' to 'additional'
author Matt Mackall <mpm@selenic.com>
date Wed, 22 Oct 2008 14:30:34 -0500
parents f60730693efc
children 25c0dee16ee0
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Oct 22 13:05:40 2008 -0500
+++ b/mercurial/commands.py	Wed Oct 22 14:30:34 2008 -0500
@@ -1242,14 +1242,11 @@
         displayer.show(changenode=n)
 
 def help_(ui, name=None, with_version=False):
-    """show help for a command, extension, or list of commands
+    """show help for a given topic or a help overview
 
     With no arguments, print a list of commands and short help.
 
-    Given a command name, print help for that command.
-
-    Given an extension name, print help for that extension, and the
-    commands it provides."""
+    Given a topic, extension, or command name, print help for that topic."""
     option_lists = []
 
     def addglobalopts(aliases):
@@ -1434,7 +1431,7 @@
                                          or "")))
 
     if not name:
-        ui.write(_("\nspecial help topics:\n\n"))
+        ui.write(_("\nadditional help topics:\n\n"))
         topics = []
         for names, header, doc in help.helptable:
             names = [(-len(name), name) for name in names]
@@ -3130,7 +3127,7 @@
          [('r', 'rev', '', _('show only heads which are descendants of rev')),
          ] + templateopts,
          _('hg heads [-r REV] [REV]...')),
-    "help": (help_, [], _('hg help [COMMAND]')),
+    "help": (help_, [], _('hg help [TOPIC]')),
     "identify|id":
         (identify,
          [('r', 'rev', '', _('identify the specified rev')),