All docs stuff for 2.1.x