- merge do's and don'ts, since they had mostly the same advice
- move token formatting info to the guideline section and the markdown section, as appropriate
- tweak spelling and fix a couple typos
- fix options vs. values in the formatting example, and add a token there.