doc tweaks after calc.deriv merge