Docs updates for 0.12

Working through #2347.

- [x] cherry pick #2413, #2414