Post 1.2.0 docs update 6

this needs #8197 added to it still (and any other PR's we might review in the mean time)

@fredlf @jamtur01 @ostezer