[MERGE] Minor wording changes in User Guide

[James Westby]

On Sat, 2008-02-23 at 21:27 -0600, Neil Martinsen-Burrell wrote:
> Aaron Bentley wrote:
> > This bundle is empty.  You need to commit your changes before you send them.
> 
> Oops, sorry about that.  First time using send and all that.  Peace,

> -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.

I don't think we need the line break before mainline.

Also could you tell us why you don't want to mention PQM there? Would
it be better if there was also a footnote to point to a page explaining
what PQM is?

Other than that I think your changes are good.

Thanks,

James