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

Conflicts:
	docs/sphinx/user-guide/installation.rst
Merge branch '2.5-testing' into 2.5-dev

Conflicts:
	docs/sphinx/user-guide/installation.rst
Merge branch '2.5-dev'