Final in-place fixes (rebased onto develop)



This is the same as gh-2071 but rebased onto develop.

----

This PR is primarily for migrating the suggested doc fixes back to the CLI itself. Most content should have already been checked, but the two code-bases will need to be kept in sync.