Backport doc fix from trunk.