Also moved the contrib deprecations at the top of their section and made minor markup fixes. Backport of 4500d35 from master.
Also moved the contrib deprecations at the top of their section and made minor markup fixes. Backport of 4500d35 from master.