Lots of organizational changes for consistency with the rest of the

documentation.

Fix a few small markup nits.