From 32676cbecfa28980b77426da56bfc1b8429ccb7d Mon Sep 17 00:00:00 2001
From: Dirk Baechle <dl9obn@darc.de>
Date: Tue, 8 Oct 2013 12:12:21 +0200
Subject: - minor change to the SCons Docbook XSD: stricter handling of para
 within the special tags "tool", "builder" and "cvar" - fixed current docs
 accordingly

---
 doc/editor_configs/serna/scons/xsd/dbpoolx.xsd                      | 3 ---
 doc/editor_configs/xmlmind/addon/config/scons/scons_xsd/dbpoolx.xsd | 3 ---
 doc/xsd/dbpoolx.xsd                                                 | 3 ---
 src/engine/SCons/Tool/msginit.xml                                   | 4 +++-
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/doc/editor_configs/serna/scons/xsd/dbpoolx.xsd b/doc/editor_configs/serna/scons/xsd/dbpoolx.xsd
index f0a3f1c..0ce5cb7 100644
--- a/doc/editor_configs/serna/scons/xsd/dbpoolx.xsd
+++ b/doc/editor_configs/serna/scons/xsd/dbpoolx.xsd
@@ -2589,7 +2589,6 @@
         </xs:documentation>
       </xs:annotation>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:group ref="para.char.mix"/>
         <xs:group ref="para.mix"/>
         <xs:group ref="tool.mix"/>
       </xs:choice>
@@ -2616,7 +2615,6 @@
         </xs:documentation>
       </xs:annotation>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:group ref="para.char.mix"/>
         <xs:group ref="para.mix"/>
         <xs:group ref="tool.mix"/>
       </xs:choice>
@@ -2644,7 +2642,6 @@
         </xs:documentation>
       </xs:annotation>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:group ref="para.char.mix"/>
         <xs:group ref="para.mix"/>
         <xs:element ref="summary"/>
       </xs:choice>
diff --git a/doc/editor_configs/xmlmind/addon/config/scons/scons_xsd/dbpoolx.xsd b/doc/editor_configs/xmlmind/addon/config/scons/scons_xsd/dbpoolx.xsd
index f0a3f1c..0ce5cb7 100644
--- a/doc/editor_configs/xmlmind/addon/config/scons/scons_xsd/dbpoolx.xsd
+++ b/doc/editor_configs/xmlmind/addon/config/scons/scons_xsd/dbpoolx.xsd
@@ -2589,7 +2589,6 @@
         </xs:documentation>
       </xs:annotation>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:group ref="para.char.mix"/>
         <xs:group ref="para.mix"/>
         <xs:group ref="tool.mix"/>
       </xs:choice>
@@ -2616,7 +2615,6 @@
         </xs:documentation>
       </xs:annotation>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:group ref="para.char.mix"/>
         <xs:group ref="para.mix"/>
         <xs:group ref="tool.mix"/>
       </xs:choice>
@@ -2644,7 +2642,6 @@
         </xs:documentation>
       </xs:annotation>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:group ref="para.char.mix"/>
         <xs:group ref="para.mix"/>
         <xs:element ref="summary"/>
       </xs:choice>
diff --git a/doc/xsd/dbpoolx.xsd b/doc/xsd/dbpoolx.xsd
index f0a3f1c..0ce5cb7 100644
--- a/doc/xsd/dbpoolx.xsd
+++ b/doc/xsd/dbpoolx.xsd
@@ -2589,7 +2589,6 @@
         </xs:documentation>
       </xs:annotation>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:group ref="para.char.mix"/>
         <xs:group ref="para.mix"/>
         <xs:group ref="tool.mix"/>
       </xs:choice>
@@ -2616,7 +2615,6 @@
         </xs:documentation>
       </xs:annotation>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:group ref="para.char.mix"/>
         <xs:group ref="para.mix"/>
         <xs:group ref="tool.mix"/>
       </xs:choice>
@@ -2644,7 +2642,6 @@
         </xs:documentation>
       </xs:annotation>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:group ref="para.char.mix"/>
         <xs:group ref="para.mix"/>
         <xs:element ref="summary"/>
       </xs:choice>
diff --git a/src/engine/SCons/Tool/msginit.xml b/src/engine/SCons/Tool/msginit.xml
index 0f89020..7ce785c 100644
--- a/src/engine/SCons/Tool/msginit.xml
+++ b/src/engine/SCons/Tool/msginit.xml
@@ -216,8 +216,10 @@ See &t-link-msginit; tool and &b-link-POInit; builder.
 Internal ``macro''. Computes locale (language) name based on target filename
 (default: <literal>'${TARGET.filebase}' </literal>).
 </para>
-</summary>
+<para>
 See &t-link-msginit; tool and &b-link-POInit; builder.
+</para>
+</summary>
 </cvar>
 
 </sconsdoc>
\ No newline at end of file
-- 
cgit v0.12