proof-reading the manual
Merge remote-tracking branch 'upstream/master' into update-docs
Merge pull request #256 from ecraven/update-docs

proof-reading the manual