merge by hand - fix up rejections in Documentation/DocBook/Makefile