[1.7.x] Fixed #22966 -- Clarified which release notes appear for each doc version.

Thanks haimunt at yahoo.com for the suggestion.

Backport of e6b3d6c22f from master
[1.7.x] Fixed a few PEP8 errors in settings doc.

Backport of 2c1384fbac from master