Rev 3438: (jam) Minor doc update for using a shared mainline in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3438
revision-id:pqm at pqm.ubuntu.com-20080520045336-2ofd76c5co8h6ygf
parent: pqm at pqm.ubuntu.com-20080520022514-gncomeyihrd1vywq
parent: john at arbash-meinel.com-20080506143457-mytwmwshmz1bu1uf
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-05-20 05:53:36 +0100
message:
  (jam) Minor doc update for using a shared mainline
modified:
  doc/en/user-guide/distributed_intro.txt distributed_intro.tx-20071123154453-dk2mjhrg1vpjm5w2-2
    ------------------------------------------------------------
    revno: 3407.1.1
    revision-id:john at arbash-meinel.com-20080506143457-mytwmwshmz1bu1uf
    parent: pqm at pqm.ubuntu.com-20080505231558-7w3zaehbvtcjk7jv
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: doc_shared_mainline
    timestamp: Tue 2008-05-06 09:34:57 -0500
    message:
      minor doc clarification for decentralized with shared-mainline
    modified:
      doc/en/user-guide/distributed_intro.txt distributed_intro.tx-20071123154453-dk2mjhrg1vpjm5w2-2
=== modified file 'doc/en/user-guide/distributed_intro.txt'
--- a/doc/en/user-guide/distributed_intro.txt	2007-11-23 15:45:20 +0000
+++ b/doc/en/user-guide/distributed_intro.txt	2008-05-06 14:34:57 +0000
@@ -11,8 +11,13 @@
 The decentralized with shared mainline workflow
 -----------------------------------------------
 
-In this workflow, each developer has their own branch or branches, plus commit rights to the main branch. They do their work in their personal branch, then merge it into the mainline when it is ready.
+In this workflow, each developer has their own branch or branches, plus
+a checkout of the main branch. They do their work in their personal
+branch, then merge it into the mainline when it is ready.
 
 .. image:: images/workflows_shared.png
 
 Other distributed workflows are explored later in this chapter.
+
+.. 
+   vim: tw=74 ft=rst