Miscellaneous docs fixes
Skip doctest that can't possibly work.
Merge pull request #2841 from takluyver/misc-doc-fixes

Miscellaneous docs fixes