[MERGE] Documentation fixes: whitespace, terminology

[Stephen J. Turnbull]

Martin Pool writes:

 > I'm ok to merge it.  I believe Patrick when he says that he was just
 > working from the bug report and did not read Ben's patch.

I believe him too.  (Note that the message I replied to could easily
be construed to say that he had referred to Ben's patch; it was in
response that he clarified that.)

 > Canonical has more important things to do than debian-legal-style
 > pin-angel-counting.

Well, I also believe you, but that doesn't fit well with the "there's
no such thing as a trivial patch" approach to assignments.