Merge proposals dependent on lp://qastaging/~mattgriffin/ubuntu-manual/10.10-updated-u1-content

1. 10.10-updated-u1-content
2. Dependent merge proposals