Update the docs for 3.0!
Merge pull request #3137 from mkoistinen/doc_fixes

Update the docs for 3.0!