Some minor documentation updates.
Merge.