user guide help (definitions of terms)

[Ian Clatworthy]

Neil Martinsen-Burrell wrote:

> Done.  It is much easier to understand with merge proposals.  If
> Launchpad merge proposals are in fact the recommended way to contribute
> to Bazaar, do we need to change HACKING.txt?  I'm willing to make the
> changes there too, but I don't know that there is consensus on the topic.

Thanks.

Yes, there's consensus that merge proposals are the preferred way so
please go ahead and update HACKING.txt accordingly.

Ian C.