Merge branch 'bc/doc-use-docbook-5'