Rev 5035: (Matthew Fuller) Update docs for using 'switch' with a checkout in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5035 [merge]
revision-id: pqm at pqm.ubuntu.com-20100212163206-uvs9ck67uqw2901y
parent: pqm at pqm.ubuntu.com-20100212151524-27ef3474ivsi2eci
parent: fullermd at over-yonder.net-20100212023402-blttkjnrlcjw23sp
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2010-02-12 16:32:06 +0000
message:
  (Matthew Fuller) Update docs for using 'switch' with a checkout
modified:
  bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
=== modified file 'bzrlib/help_topics/__init__.py'
--- a/bzrlib/help_topics/__init__.py	2010-02-12 11:58:21 +0000
+++ b/bzrlib/help_topics/__init__.py	2010-02-12 16:32:06 +0000
@@ -406,13 +406,13 @@
 end. Checkouts also work on the local file system, so that all that matters is
 file permissions.
 
-You can change the master of a checkout by using the "bind" command (see "help
-bind"). This will change the location that the commits are sent to. The bind
-command can also be used to turn a branch into a heavy checkout. If you
-would like to convert your heavy checkout into a normal branch so that every
-commit is local, you can use the "unbind" command. To see whether or not a
-branch is bound or not you can use the "info" command. If the branch is bound
-it will tell you the location of the bound branch.
+You can change the master of a checkout by using the "switch" command (see
+"help switch").  This will change the location that the commits are sent to.
+The "bind" command can also be used to turn a normal branch into a heavy
+checkout. If you would like to convert your heavy checkout into a normal
+branch so that every commit is local, you can use the "unbind" command. To see
+whether or not a branch is bound or not you can use the "info" command. If the
+branch is bound it will tell you the location of the bound branch.
 
 Related commands::
 
@@ -422,8 +422,10 @@
   commit      Make a commit that is sent to the master branch. If you have
               a heavy checkout then the --local option will commit to the
               checkout without sending the commit to the master
-  bind        Change the master branch that the commits in the checkout will
+  switch      Change the master branch that the commits in the checkout will
               be sent to
+  bind        Turn a standalone branch into a heavy checkout so that any
+              commits will be sent to the master branch
   unbind      Turn a heavy checkout into a standalone branch so that any
               commits are only made locally
   info        Displays whether a branch is bound or unbound. If the branch is