Merge branch 'docs-fixes' into docs-next

Bring a handful of (relatively) urgent fixes into docs-next as well.