Merge doc fixes.