merging dapper->edgy

[Matthew East]

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

Hi all,

As per [1] I've merged most things that I could think of from the dapper
branch into trunk. I also did the Kubuntu Desktop Guide because it
hadn't yet been merged. However, I haven't done any sort of
comprehensive check about what documents are up to date in trunk and
which aren't: please double check your documents!

I know Jordan did the Packaging Guide, and I think the Desktop Guides
and Server Guide are fine too.

Also let me know if I've broken anything - everything should be building ok.

[1]
https://lists.ubuntu.com/archives/ubuntu-doc-commits/2006-June/002674.html

Matt
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEpDqptSaF0w5rBv8RAmnZAJ0ZVo3W5+l8WYhOMPZxnELobX22NQCdE8Jh
4Af0lfw/rhLXdCIr2cBb+Zg=
=4sD8
-----END PGP SIGNATURE-----