merge doc changes from 4.2 branch