[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.
|

Unfortunately you based in on bzr.dev after I merged back 1.5rc1 and removed the
transaction cache, etc. So I *have* to cherry pick it into 1.5. I would have
preferred if you had developed this against the 1.5 branch, since you were
intending it to land there.

Anyway, I'll try to merge it to both places to preserve your history, even
though it will show up as a cherrypick in 1.5.

John
=:->

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

iEYEARECAAYFAkgtuGsACgkQJdeBCYSNAAOtQQCeJmG887z86Ojx67Zals17u+Uv
AzUAoIg7blzDJlGNTpmR+s3uCIakb223
=2t2C
-----END PGP SIGNATURE-----