Clarified some help topics in trychange.py.

trychange.py

 #!/usr/bin/python
 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 """Client-side script to send a try job to the try server. It communicates to
 the try server by either writting to a svn repository or by directly connecting
 to the server by HTTP.
 """
 
 import datetime
@@ skipping 488 matching lines @@
   group.add_option("--patchset", type='int',
                    help="Update rietveld issue try job status. This is "
                         "optional if --issue is used, In that case, the "
                         "latest patchset will be used.")
   group.add_option("--dry_run", action='store_true',
                    help="Just prints the diff and quits")
   parser.add_option_group(group)
 
   group = optparse.OptionGroup(parser, "Try job options")
   group.add_option("-b", "--bot", action="append",
-                    help="Only use specifics build slaves, ex: '--bot win' to "
-                         "run the try job only on the 'win' slave; see the try "
+                    help="Only use specifics build slaves, ex: "
+                         "'--bot win,layout_mac'; see the try "
                          "server waterfall for the slave's name")
   group.add_option("-r", "--revision",
                     help="Revision to use for the try job; default: the "
                          "revision will be determined by the try server; see "
                          "its waterfall for more info")
   group.add_option("-c", "--clobber", action="store_true",
                     help="Force a clobber before building; e.g. don't do an "
                          "incremental build")
   # TODO(maruel): help="Select a specific configuration, usually 'debug' or "
   #                    "'release'"
@@ skipping 29 matching lines @@
                         "Specify which code review patch to use as the try job "
                         "or rietveld instance to update the try job results "
                         "Default:%default")
   group.add_option("--root",
                    help="Root to use for the patch; base subdirectory for "
                         "patch created in a subdirectory")
   group.add_option("-p", "--patchlevel", type='int', metavar="LEVEL",
                    help="Used as -pN parameter to patch")
   group.add_option("-s", "--sub_rep", action="append", default=[],
                    help="Subcheckout to use in addition. This is mainly "
-                        "useful for gclient-style checkouts. Use @rev or "
-                        "@branch or @branch1..branch2 to specify the "
-                        "revision/branch to diff against.")
+                        "useful for gclient-style checkouts. In git, checkout "
+                        "the branch with changes first. Use @rev or "
+                        "@branch to specify the "
+                        "revision/branch to diff against. If no @branch is "
+                        "given the diff will be against the upstream branch. "
+                        "If @branch then the diff is branch..HEAD. "
+                        "All edits must be checked in.")
   group.add_option("--no_gclient", action="store_true",
                    help="Disable automatic search for gclient checkout.")
   group.add_option("-E", "--exclude", action="append",
                    default=['ChangeLog'], metavar='REGEXP',
                    help="Regexp patterns to exclude files. Default: %default")
   parser.add_option_group(group)
 
   group = optparse.OptionGroup(parser, "Access the try server by HTTP")
   group.add_option("--use_http",
                    action="store_const",
@@ skipping 177 matching lines @@
     print >> sys.stderr, e
     return 1
   except gclient_utils.Error, e:
     print >> sys.stderr, e
     return 1
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(TryChange(None, [], False))