Rev 3238: (Neil Martinsen-Burrell) doc cleanups in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3238
revision-id:pqm at pqm.ubuntu.com-20080227181337-obp6vadq9d34z220
parent: pqm at pqm.ubuntu.com-20080227060052-pq0rxy2q8r25f08e
parent: john at arbash-meinel.com-20080227161929-vpcyxi0v7ei24sqg
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-02-27 18:13:37 +0000
message:
  (Neil Martinsen-Burrell) doc cleanups
modified:
  doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
  doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
    ------------------------------------------------------------
    revno: 3237.1.1
    revision-id:john at arbash-meinel.com-20080227161929-vpcyxi0v7ei24sqg
    parent: pqm at pqm.ubuntu.com-20080227060052-pq0rxy2q8r25f08e
    parent: nmb at wartburg.edu-20080224025524-aeh6wuc2jnxloykf
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Wed 2008-02-27 10:19:29 -0600
    message:
      merge doc changes
    modified:
      doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
      doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
    ------------------------------------------------------------
    revno: 3234.1.1
    revision-id:nmb at wartburg.edu-20080224025524-aeh6wuc2jnxloykf
    parent: pqm at pqm.ubuntu.com-20080224013817-4ps9nmrzjtg9ugtz
    committer: Neil Martinsen-Burrell <nmb at wartburg.edu>
    branch nick: minor-user-guide-changes
    timestamp: Sat 2008-02-23 20:55:24 -0600
    message:
      minor doc changes
    modified:
      doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
      doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
=== modified file 'doc/en/user-guide/bazaar_workflows.txt'
--- a/doc/en/user-guide/bazaar_workflows.txt	2007-11-30 03:38:22 +0000
+++ b/doc/en/user-guide/bazaar_workflows.txt	2008-02-24 02:55:24 +0000
@@ -110,7 +110,8 @@
 Decentralized with automatic gatekeeper
 ---------------------------------------
 
-In this workflow, each developer has their own branch or branches, plus read-only access to the mainline. A software gatekeeper (e.g. PQM) has commit rights to the main branch. When a developer wants their work merged, they request another person to review it. Once passed review, either the original author or the reviewer asks the gatekeeper to merge it, depending on team policies. The gatekeeper does a merge, a compile, and runs the test suite. If and only if the code passes, it is merged into the mainline.
+In this workflow, each developer has their own branch or branches, plus read-only access to the mainline. A software gatekeeper has commit rights to the main branch. When a developer wants their work merged, they request another person to review it. Once it has passed review, either the original author or the reviewer asks the gatekeeper software to merge it, depending on team policies. The gatekeeper software does a merge, a compile, and runs the test suite. If and only if the code passes, it is merged into the
+mainline.
 
 Note: As an alternative, the review step can be skipped and the author can submit the change to the automatic gatekeeper without it. (This is particularly appropriate when using practices such as Pair Programming that effectively promote just-in-time reviews instead of reviewing code as a separate step.)
 

=== modified file 'doc/en/user-guide/branching_a_project.txt'
--- a/doc/en/user-guide/branching_a_project.txt	2007-11-27 21:17:06 +0000
+++ b/doc/en/user-guide/branching_a_project.txt	2008-02-24 02:55:24 +0000
@@ -30,14 +30,14 @@
 `URL Identifiers <../user-reference/bzr_man.html#url-identifiers>`_
 section of the Bazaar User Reference.
 
-A reminder re shared repositories
----------------------------------
+A reminder about shared repositories
+------------------------------------
 
 Before getting a copy of a branch, have a quick think about
 where to put it on your filesystem. For maximum storage
 efficiency down the track, it is recommended that branches
-be created somewhere under a directory setup as a shared
-repository. For example::
+be created somewhere under a directory that has been set up
+as a shared repository. For example::
 
   bzr init-repo my-repo
   cd my-repo