From cc6376fdb6bb3bff8ce0b432e23b1fa4ed13a210 Mon Sep 17 00:00:00 2001
From: Cynthia Shang <cynthia.shang@crunchydata.com>
Date: Mon, 31 Dec 2018 09:19:38 +0200
Subject: [PATCH] Modify general document elements to allow any child element.

This allows for nesting of elements such as <b> and <i>.

Contributed by Cynthia Shang.
---
 doc/xml/dtd/doc.dtd | 16 ++++++----------
 doc/xml/release.xml |  8 ++++++++
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/doc/xml/dtd/doc.dtd b/doc/xml/dtd/doc.dtd
index 5b1060087..81832c409 100644
--- a/doc/xml/dtd/doc.dtd
+++ b/doc/xml/dtd/doc.dtd
@@ -227,20 +227,16 @@
     <!ATTLIST admonition type CDATA #REQUIRED>
 <!ELEMENT summary (#PCDATA|quote|b|i|ul|ol|id|code|code-block|host|file|path|cmd|setting|exe|backrest|postgres|br-option|
                    br-setting|pg-option|pg-setting|link|user|proper)*>
-<!ELEMENT p (#PCDATA|quote|b|i|id|code|code-block|host|file|path|cmd|setting|exe|backrest|postgres|br-option|br-setting|
-             pg-option|pg-setting|link|user|proper)*>
+<!ELEMENT p ANY>
     <!ATTLIST p if CDATA "">
-<!ELEMENT text (#PCDATA|quote|b|i|ul|ol|id|code|code-block|host|file|path|cmd|setting|exe|backrest|postgres|br-option|
-                br-setting|pg-option|pg-setting|link|user|proper|admonition)*>
-<!ELEMENT i (#PCDATA)>
-<!ELEMENT b (#PCDATA)>
+<!ELEMENT text ANY>
+<!ELEMENT i ANY>
+<!ELEMENT b ANY>
 <!ELEMENT ul (li+)>
 <!ELEMENT ol (li+)>
-<!ELEMENT li (#PCDATA|quote|b|i|ul|ol|id|code|code-block|host|file|path|cmd|setting|exe|backrest|postgres|br-option|
-              br-setting|pg-option|pg-setting|link|user|proper)*>
+<!ELEMENT li ANY>
 <!ELEMENT list (list-item+)>
-<!ELEMENT list-item (#PCDATA|quote|b|i|ul|ol|id|code|code-block|host|file|path|cmd|setting|exe|backrest|postgres|br-option|
-              br-setting|pg-option|pg-setting|link|user|proper)*>
+<!ELEMENT list-item ANY>
 <!ELEMENT id (#PCDATA)>
 <!ELEMENT code (#PCDATA)>
 <!ELEMENT code-block (#PCDATA|exe)*>
diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index a0c51fe28..248898bb3 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -299,6 +299,14 @@
                         <p>Allow custom logo for PDF documentation.</p>
                     </release-item>
 
+                    <release-item>
+                        <release-item-contributor-list>
+                            <release-item-contributor id="cynthia.shang"/>
+                        </release-item-contributor-list>
+
+                        <p>Modify general document elements to allow any child element.</p>
+                    </release-item>
+
                     <release-item>
                         <p>Use absolute paths so that <file>./doc.pl</file> runs.</p>
                     </release-item>