Tweak docs changes a bit.
Merge pull request #1031 from ramiro/issue_941

Tweak docs changes a bit.