Cherry pick documentation updates which appear to have been
lost during a previous merge.

Fixes gh-1523
Cheery-picked from 16c2477d