add cross-references from env vars to CLI options
fix inconsistencies in env var to CLI crossrefs
fix a few doc typos and formatting errors
revert introduction of inconsistent em dash usage
add changelog entry for env var cross-references
Merge branch '894-int' into 1.5

Conflicts:
	docs/changelog.rst
Merge branch '1.5' into 1.6

Conflicts:
	docs/changelog.rst
Merge branch '1.6'