r11152: fix some regressions caused by the trunk->3.0 merge when install docs with...