Update docs for 2.1 maintenance branch (r2865)