Docs merge 1.0.1 post1

Documentation fixes that would be good to have before we hit 1.1.0 changes

I'd like to add #2712 and #6676 too, but I won't wait long :)

@jamtur01 @ostezer @fredlf