A batch of 2.x documentation updates