Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11