Update master for new documentation standards

Hi guys!

This is a catch-up to get us inline on the master branch with the release policies from #2720.  Specifically, I'm pretending as if 2.1 had reached its end-of-life today, and am applying all the needed changes to the master branch.

I'm going to merge this immediately - I just wanted this PR for future reference.

Cheers!