diff --git a/doc/global/macros.qdocconf b/doc/global/macros.qdocconf
index ef3ca1dc1de..f553cd8e143 100644
--- a/doc/global/macros.qdocconf
+++ b/doc/global/macros.qdocconf
@@ -1,39 +1,41 @@
-macro.aacute.HTML       = "á"
-macro.Aring.HTML        = "Å"
-macro.aring.HTML        = "å"
-macro.Auml.HTML         = "Ä"
-macro.author            = "\\b{Author:}"
-macro.BR.HTML           = "<br />"
-macro.copyright.HTML    = "&copy;"
-macro.eacute.HTML       = "&eacute;"
-macro.gui               = "\\b"
-macro.HR.HTML           = "<hr />"
-macro.iacute.HTML       = "&iacute;"
-macro.key               = "\\b"
-macro.macos             = "macOS"
-macro.menu              = "\\b"
-macro.oslash.HTML       = "&oslash;"
-macro.ouml.HTML         = "&ouml;"
-macro.nullptr           = "\\c{nullptr}"
-macro.QA                = "\\e{Qt Assistant}"
-macro.QD                = "\\e{Qt Designer}"
-macro.QL                = "\\e{Qt Linguist}"
-macro.QQV               = "\\e{Qt QML Viewer}"
-macro.QtVersion         = "$QT_VERSION"
-macro.QtVer             = "$QT_VER"
-macro.param             = "\\e"
-macro.raisedaster.HTML  = "<sup>*</sup>"
-macro.rarrow.HTML       = "&rarr;"
-macro.reg.HTML          = "<sup>&reg;</sup>"
-macro.return            = "Returns"
-macro.starslash         = "\\c{*/}"
-macro.begincomment      = "\\c{/*}"
-macro.endcomment        = "\\c{*/}"
-macro.uuml.HTML         = "&uuml;"
-macro.mdash.HTML        = "&mdash;"
-macro.pi.HTML         = "&Pi;"
-macro.beginqdoc.HTML    = "/*!"
-macro.endqdoc.HTML      = "*/"
+macro.aacute.HTML         = "&aacute;"
+macro.Aring.HTML          = "&Aring;"
+macro.aring.HTML          = "&aring;"
+macro.Auml.HTML           = "&Auml;"
+macro.author              = "\\b{Author:}"
+macro.BR.HTML             = "<br />"
+macro.copyright.HTML      = "&copy;"
+macro.eacute.HTML         = "&eacute;"
+macro.gui                 = "\\b"
+macro.HR.HTML             = "<hr />"
+macro.iacute.HTML         = "&iacute;"
+macro.key                 = "\\b"
+macro.macos               = "macOS"
+macro.menu                = "\\b"
+macro.oslash.HTML         = "&oslash;"
+macro.ouml.HTML           = "&ouml;"
+macro.nullptr             = "\\c{nullptr}"
+macro.QA                  = "\\e{Qt Assistant}"
+macro.QD                  = "\\e{Qt Designer}"
+macro.QL                  = "\\e{Qt Linguist}"
+macro.QQV                 = "\\e{Qt QML Viewer}"
+macro.QtVersion           = "$QT_VERSION"
+macro.QtVer               = "$QT_VER"
+macro.param               = "\\e"
+macro.raisedaster.HTML    = "<sup>*</sup>"
+macro.raisedaster.DocBook = "\\sup{*}"
+macro.rarrow.HTML         = "&rarr;"
+macro.reg.HTML            = "<sup>&reg;</sup>"
+macro.rego.DocBook         = "\\sup{&#174;}"
+macro.return              = "Returns"
+macro.starslash           = "\\c{*/}"
+macro.begincomment        = "\\c{/*}"
+macro.endcomment          = "\\c{*/}"
+macro.uuml.HTML           = "&uuml;"
+macro.mdash.HTML          = "&mdash;"
+macro.pi.HTML             = "&Pi;"
+macro.beginqdoc.HTML      = "/*!"
+macro.endqdoc.HTML        = "*/"
 macro.borderedimage       = "\\div {class=\"border\"} \\image \1\n\\enddiv"
 
 macro.beginfloatleft.HTML   = "<div style=\"float: left; margin-right: 2em\">"