Port a previous change to DocBook
Merge branch 'version1.1'