#2762: remove 2.x remnants and patch up some new documentation.
6 files changed