Rev 3310: (Matthew Fuller) Trivial User Guide fixes (igc) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3310
revision-id:pqm at pqm.ubuntu.com-20080327064129-8egj1nnju8z9v91b
parent: pqm at pqm.ubuntu.com-20080327022136-3r7xq97mm5j5s1x6
parent: ian.clatworthy at canonical.com-20080327045730-imw32ail0iz0msmb
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-03-27 06:41:29 +0000
message:
  (Matthew Fuller) Trivial User Guide fixes (igc)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
  doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
    ------------------------------------------------------------
    revno: 3308.1.1
    revision-id:ian.clatworthy at canonical.com-20080327045730-imw32ail0iz0msmb
    parent: pqm at pqm.ubuntu.com-20080326124829-ggl5f8711x321ahw
    parent: fullermd at over-yonder.net-20080327005519-hp1uy5d1x92qfhfw
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: ianc-integration
    timestamp: Thu 2008-03-27 14:57:30 +1000
    message:
      (Matthew Fuller) Trivial User Guide fixes
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
      doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
    ------------------------------------------------------------
    revno: 3303.1.3
    revision-id:fullermd at over-yonder.net-20080327005519-hp1uy5d1x92qfhfw
    parent: fullermd at over-yonder.net-20080327000602-mupzgfeqdsv6ujqj
    committer: Matthew Fuller <fullermd at over-yonder.net>
    branch nick: guide-fixes
    timestamp: Wed 2008-03-26 19:55:19 -0500
    message:
      Using revert to back out a revision's fix is only really meaningful if
      it's the last revision.  If it's not, you really want 'Reverse
      cherrypicking' instead.  Slip an explanation and cross-reference in
      after the example.
    modified:
      doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
    ------------------------------------------------------------
    revno: 3303.1.2
    revision-id:fullermd at over-yonder.net-20080327000602-mupzgfeqdsv6ujqj
    parent: fullermd at over-yonder.net-20080326165239-70h07p1jk35mn1vc
    committer: Matthew Fuller <fullermd at over-yonder.net>
    branch nick: guide-fixes
    timestamp: Wed 2008-03-26 19:06:02 -0500
    message:
      There's nothing straight about a straitjacket.
    modified:
      doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
    ------------------------------------------------------------
    revno: 3303.1.1
    revision-id:fullermd at over-yonder.net-20080326165239-70h07p1jk35mn1vc
    parent: pqm at pqm.ubuntu.com-20080325070104-4k2nyfye5v0sublz
    committer: Matthew Fuller <fullermd at over-yonder.net>
    branch nick: guide-fixes
    timestamp: Wed 2008-03-26 11:52:39 -0500
    message:
      If you want to get rid of the changes you made in rev20, you want to
      revert to 19, not 20.
    modified:
      doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
=== modified file 'NEWS'
--- a/NEWS	2008-03-27 02:21:36 +0000
+++ b/NEWS	2008-03-27 06:41:29 +0000
@@ -60,6 +60,8 @@
 
   DOCUMENTATION:
 
+    * Minor fixes to the User Guide. (Matthew Fuller)
+
   API BREAKS:
 
     * Attempting to pull data from a ghost aware repository (e.g. knits) into a

=== modified file 'doc/en/user-guide/partner_intro.txt'
--- a/doc/en/user-guide/partner_intro.txt	2007-11-23 05:52:03 +0000
+++ b/doc/en/user-guide/partner_intro.txt	2008-03-27 00:06:02 +0000
@@ -14,7 +14,7 @@
 Imagine if you were not allowed to call someone on the phone directly
 and the only way to talk to them was by registering a conference call first?
 Companies and communities that only share code via a central VCS
-repository are living with a similar straight-jacket to that every day.
+repository are living with a similar strait-jacket to that every day.
 There are times when central control makes a lot of sense and times
 when peer-to-peer rocks. Either way, Bazaar is designed to help.
 

=== modified file 'doc/en/user-guide/undoing_mistakes.txt'
--- a/doc/en/user-guide/undoing_mistakes.txt	2007-12-04 12:39:37 +0000
+++ b/doc/en/user-guide/undoing_mistakes.txt	2008-03-27 04:57:30 +0000
@@ -126,9 +126,20 @@
   Committed revision 20.
   (release the code)
   (hmm - bad fix)
-  bzr revert -r 20
+  bzr revert -r 19
   bzr commit -m "Backout fix for bug #5"
 
+This will change your entire tree back to the state as of revision 19,
+which is probably only what you want if you haven't made any new commits
+since then. If you have, the ``revert`` would wipe them out as well. In that
+case, you probably want to use `Reverse cherrypicking`_ instead to
+back out the bad fix.
+
+Note: As an alternative to using an absolute bug number (like 19), you can
+specify one relative to the tip (-1) using a negative number like this::
+
+  bzr revert -r -2
+
 Correcting a tag
 ----------------
 
@@ -137,6 +148,7 @@
 
   bzr tag 2.0-beta-1
   (oops, we're not yet ready for that)
+  (make more commits to include more fixes)
   bzr tag 2.0-beta-1 --force
 
 Clearing a tag