Doco upgrade for M2.