Clean up variables to use correct <replaceable>XXX</replaceable> formatting.

Fix typos, white space, and other issues.

Change-Id: I61bae90144caf9dbc0149990ff92eb0c0eebec24
author: Diane Fleming dfleming@austin.rr.com