diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1078,16 +1078,16 @@ table = {
     "^add": (add,
              [('I', 'include', [], 'include path in search'),
               ('X', 'exclude', [], 'exclude path from search')],
-             "hg add [OPTIONS] [FILES]"),
-    "addremove": (addremove, [], "hg addremove [FILES]"),
+             "hg add [FILE]..."),
+    "addremove": (addremove, [], "hg addremove [FILE]..."),
     "^annotate":
         (annotate,
-         [('I', 'include', [], 'include path in search'),
-          ('X', 'exclude', [], 'exclude path from search'),
-          ('r', 'rev', '', 'revision'),
+         [('r', 'rev', '', 'revision'),
           ('u', 'user', None, 'show user'),
           ('n', 'number', None, 'show revision number'),
-          ('c', 'changeset', None, 'show changeset')],
+          ('c', 'changeset', None, 'show changeset'),
+          ('I', 'include', [], 'include path in search'),
+          ('X', 'exclude', [], 'exclude path from search')],
          'hg annotate [-r REV] [-u] [-n] [-c] FILE...'),
     "cat":
         (cat,
@@ -1101,7 +1101,7 @@ table = {
         (commit,
          [('A', 'addremove', None, 'run add/remove during commit'),
           ('m', 'text', "", 'commit message'),
-          ('t', 'text', "", 'commit message (deprecated)'),
+          ('t', 'text', "", 'commit message (deprecated: use -m)'),
           ('l', 'logfile', "", 'commit text file'),
           ('d', 'date', "", 'date code'),
           ('u', 'user', "", 'user')],
@@ -1113,9 +1113,9 @@ table = {
     "debugindexdot": (debugindexdot, [], 'debugindexdot FILE'),
     "^diff":
         (diff,
-         [('I', 'include', [], 'include path in search'),
-          ('X', 'exclude', [], 'exclude path from search'),
-          ('r', 'rev', [], 'revision')],
+         [('r', 'rev', [], 'revision'),
+          ('I', 'include', [], 'include path in search'),
+          ('X', 'exclude', [], 'exclude path from search')],
          'hg diff [-r REV1 [-r REV2]] [FILE]...'),
     "^export":
         (export,
@@ -1133,12 +1133,12 @@ table = {
     "^init": (init, [], 'hg init'),
     "locate":
         (locate,
-         [('0', 'print0', None, 'end records with NUL'),
+         [('r', 'rev', '', 'revision'),
+          ('0', 'print0', None, 'end records with NUL'),
           ('f', 'fullpath', None, 'print complete paths'),
           ('I', 'include', [], 'include path in search'),
-          ('r', 'rev', '', 'revision'),
           ('X', 'exclude', [], 'exclude path from search')],
-         'hg locate [OPTION]... [PATTERN]...'),
+         'hg locate [-r REV] [-f] [-0] [PATTERN]...'),
     "^log|history":
         (log,
          [('r', 'rev', [], 'revision'),
@@ -1167,7 +1167,7 @@ table = {
         (revert,
          [("n", "nonrecursive", None, "don't recurse into subdirs"),
           ("r", "rev", "", "revision")],
-         "hg revert [-n] [-r REV] NAME..."),
+         "hg revert [-n] [-r REV] [NAME]..."),
     "root": (root, [], "hg root"),
     "^serve":
         (serve,
@@ -1182,7 +1182,7 @@ table = {
     "^status": (status,
                 [('I', 'include', [], 'include path in search'),
                  ('X', 'exclude', [], 'exclude path from search')],
-                'hg status [OPTION]... [FILE]...'),
+                'hg status [FILE]...'),
     "tag":
         (tag,
          [('l', 'local', None, 'make the tag local'),
diff --git a/tests/test-help.out b/tests/test-help.out
--- a/tests/test-help.out
+++ b/tests/test-help.out
@@ -33,7 +33,7 @@ basic hg commands (use "hg help -v" for 
  status     show changed files in the working directory
  update     update or merge working directory
 hg add: option -h not recognized
-hg add [OPTIONS] [FILES]
+hg add [FILE]...
 
  -I --include 
    include path in search
@@ -42,7 +42,7 @@ hg add [OPTIONS] [FILES]
 
 add the specified files on the next commit
 hg add: option --skjdfks not recognized
-hg add [OPTIONS] [FILES]
+hg add [FILE]...
 
  -I --include 
    include path in search
@@ -52,12 +52,12 @@ hg add [OPTIONS] [FILES]
 add the specified files on the next commit
 hg diff [-r REV1 [-r REV2]] [FILE]...
 
+ -r --rev 
+   revision
  -I --include 
    include path in search
  -X --exclude 
    exclude path from search
- -r --rev 
-   revision
 
 diff working directory (or selected files)
 hg: unknown command foo