Merge proposals dependent on lp://staging/~ubuntu-developer-manual/ubuntu-developer-manual/glossary

1. glossary
2. Dependent merge proposals