pedantic doc updates
Merge pull request #991 from ericbuehl/master

pedantic doc updates