A number of doc corrections, typos and updates.

Also, addresses #3124
Merge pull request #3130 from divio/docs_edits

A number of doc corrections, typos and updates. Fixes #3124.