[MERGE] Minor wording changes in User Guide

[James Westby]

On Sun, 2008-02-24 at 19:44 +0000, Neil Martinsen-Burrell wrote:
> James Westby <jw+debian <at> jameswestby.net> writes:
> 
> > I don't think we need the line break before mainline.
> 
> I don't think I inserted a line break.  That part of the reST document is all on
> one long line.

The patch came in with one line deletion and two additions, indicating
there was a new line break there. However if it is fixed in
your local copy that's fine.

> 
> > 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?
> 
> PQM is mentioned later in the paragraph.  This is parallel to the previous
> section, where Bundle Buggy is mentioned after describing the workflow as a
> companion tool to bzr that is helpful in such workflows.  I think that expaining
> the workflow in a tool-agnostic way is valuable, then following that up with a
> reference.  If we *do* want to mention PQM parenthetically in describing the
> workflow, we should do so in more useful detail than just "(e.g. PQM)".

Sounds good to me, I wasn't reviewing the patch in context so I missed
this, I was just interested in your reasoning.

Thanks,

James