Doc updates

This is https://gerrit.wikimedia.org/r/81272 and https://gerrit.wikimedia.org/r/81273 (except that gerrit is down and I can't update them in gerrit).