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

1. distribution
2. Dependent merge proposals