5.0.3: CLI documentation

This PR addresses several CLI documentation needs summarized in https://trello.com/c/AmB1db6W/57-5-0-3-documentation-fixes.
This is using Sphinx `option` markup. I gave it a try to see how it looks to differentiate options but I am happy to revert to plain sentences if this is easier to read.