Merge branch '2021-01-22-doc-updates'

- Assorted documentation updates