Merge branch 'jn/maint-doc-user-manual-html-doctype'