Various doc fixes.
Merge pull request #2431 from joto/doc-fixes

Various doc fixes.