beat docbook2x into shape, rebuild