Documentation fixes
Merge pull request #2279 from astrofrog/rebase-2217

Documentation fixes