Docs updates and corrections
Merge pull request #4757 from magistere/master

Docs updates and corrections