Additional docs tweaks for 3.x. [ci skip]