[MERGE] Documentation fixes: whitespace, terminology

[Stephen J. Turnbull]

Patrick Regan writes:

 > > I went ahead and made the same changes. This way Mr. Finney's idea will
 > make it in, even if his actual code/changes can not. Hopefully, something
 > can be worked out so that future patches from Mr. Finney can be accepted.

Er, if they're the same changes and you looked at his code, you are
not in a position to contribute them to Bazaar; it's still his
copyright.  I don't think Canonical legal is going to like that at all.