Fix some documentation issues.
Revert a wrong doc change.
Merge pull request #2055 from arthurschreiber/patch-3

Fix some documentation issues.