[MERGE] Trivial User Guide fixes

Matthew D. Fuller fullermd at over-yonder.net
Thu Mar 27 00:59:35 GMT 2008


SSIA.  Correct a few typos, and add an explanatory cross-reference
where it should be to forestall incorrect assumptions.


-- 
Matthew Fuller     (MF4839)   |  fullermd at over-yonder.net
Systems/Network Administrator |  http://www.over-yonder.net/~fullermd/
           On the Internet, nobody can hear you scream.
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: fullermd at over-yonder.net-20080327005519-\
#   hp1uy5d1x92qfhfw
# target_branch: file:///home/fullermd/src/bzr/bzr.dev/
# testament_sha1: a8f3105917979e7722c537b122cfa9e375250ab0
# timestamp: 2008-03-26 19:57:28 -0500
# base_revision_id: pqm at pqm.ubuntu.com-20080325070104-4k2nyfye5v0sublz
# 
# Begin patch
=== modified file 'doc/en/user-guide/partner_intro.txt'
--- doc/en/user-guide/partner_intro.txt	2007-11-23 05:52:03 +0000
+++ 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'
--- doc/en/user-guide/undoing_mistakes.txt	2007-12-04 12:39:37 +0000
+++ doc/en/user-guide/undoing_mistakes.txt	2008-03-27 00:55:19 +0000
@@ -126,9 +126,15 @@
   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.
+
 Correcting a tag
 ----------------
 

# Begin bundle
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
FxQo3XQYB8oXYtbz/i7kinChIEpXTXo=


More information about the bazaar mailing list