[MERGE] Add Bazaar Zen section to the User Guide

[Ian Clatworthy]

Martin Pool wrote:
> On Tue, Jun 3, 2008 at 6:43 AM, John Arbash Meinel
> <john at arbash-meinel.com> wrote:
>> John Arbash Meinel has voted tweak.

>> ^- Should we do this as an actual ReST footnote?
>> http://docutils.sourceforge.net/docs/user/rst/quickref.html#footnotes
> 
> Agree.

Done.

>> I'm not sure about this last paragraph:
>> +Bazaar may *seem* similar to other distributed VCS tools (like Darcs, Git
>> +and Mercurial) but it presents history differently and that encourages
>> certain
>> +ways of working. In general, if you follow the advice given earlier -
>> organise
>> +your work in branches and use merge to collaborate - you'll find Bazaar
>> +generally does what you expect.
> 
> I agree, the tone is not quite right.  You could just delete the first
> sentence.  But perhaps "use the tool the way it wants to be used" can
> just be implicit from us giving advice on how to use it?

First sentence deleted. Sending this to PQM now. If we need/want further
tweaks, they can come later.

Ian C.