update 3.0.0 docs to reflect #5786

This is #6462 ported to 3.0.0-wip.