Merge doc changes; small related updates.
2 files changed