making improvements suggested by Preethi
Merge branch 'mhrivnak-doc-updates-from-preethi' into 2.4-testing