Upstreamed some of the doc fixes in a fork.

Upstreamed some of the doc fixes in a fork.