Doc tweaks
Merge pull request #1888 from dpeek/docs

Doc tweaks