[MERGE] Fixes to 1.5 User Guide

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ian Clatworthy wrote:
| Martin Pool wrote:
|> Martin Pool has voted approve.
|> Status is now: Approved
|> Comment:
|> I think this would be good for 1.5final.
|
| John,
|
| I've attached the bundle I want merged/cherrypicked into 1.5. (This
| hasn't landed on bzr.dev yet sorry.)
|
| Ian C.
|

I'm happy to merge it into 1.5 and then bring it across from there.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkgtsGsACgkQJdeBCYSNAAOrVwCgnwja6E+irA5ILPSS/g5aRVzx
e1sAoM99NSx+9ieK0gHHJKrEzrEU109F
=GC9X
-----END PGP SIGNATURE-----