summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Baechle <dl9obn@darc.de>2013-10-08 10:12:21 (GMT)
committerDirk Baechle <dl9obn@darc.de>2013-10-08 10:12:21 (GMT)
commit32676cbecfa28980b77426da56bfc1b8429ccb7d (patch)
tree91b6ae3a56484b79406b17cec982d0b225fa3650
parent17832ddc1e166221b0cd20da3a6969a65deba247 (diff)
downloadSCons-32676cbecfa28980b77426da56bfc1b8429ccb7d.zip
SCons-32676cbecfa28980b77426da56bfc1b8429ccb7d.tar.gz
SCons-32676cbecfa28980b77426da56bfc1b8429ccb7d.tar.bz2
- minor change to the SCons Docbook XSD: stricter handling of para within the special tags "tool", "builder" and "cvar"
- fixed current docs accordingly
-rw-r--r--doc/editor_configs/serna/scons/xsd/dbpoolx.xsd3
-rw-r--r--doc/editor_configs/xmlmind/addon/config/scons/scons_xsd/dbpoolx.xsd3
-rw-r--r--doc/xsd/dbpoolx.xsd3
-rw-r--r--src/engine/SCons/Tool/msginit.xml4
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