Documentation Fixes

The bigger, uglier brother of #34090.