Remove varentry modification from DTD (#103)

Girgias · web-flow · commit 4269a937f33f · 2023-11-01T17:10:01.000Z
diff --git a/docbook/docbook-xml/docbook.dtd b/docbook/docbook-xml/docbook.dtd
@@ -2332,7 +2332,7 @@
 	role	CDATA	#IMPLIED
 	%db.common.attributes;
 	%db.common.linking.attributes;
-	pubwork	(article|bbs|book|cdrom|chapter|dvd|emailmessage|gopher|journal|manuscript|newsposting|part|phpdoc:varentry|refentry|section|series|set|webpage|wiki)	#IMPLIED
+	pubwork	(article|bbs|book|cdrom|chapter|dvd|emailmessage|gopher|journal|manuscript|newsposting|part|refentry|section|series|set|webpage|wiki)	#IMPLIED
 
 >
 
@@ -2584,7 +2584,7 @@
 
 >
 
-<!ELEMENT appendix (((title|titleabbrev|subtitle)*, info?), ((glossary|bibliography|index|toc)*, (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(phpdoc:varentry|refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(phpdoc:varentry|refentry)+), (glossary|bibliography|index|toc)*))>
+<!ELEMENT appendix (((title|titleabbrev|subtitle)*, info?), ((glossary|bibliography|index|toc)*, (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(refentry)+), (glossary|bibliography|index|toc)*))>
 
 <!ATTLIST appendix
 	xmlns	CDATA	#FIXED	"http://docbook.org/ns/docbook"
@@ -2596,7 +2596,7 @@
 
 >
 
-<!ELEMENT chapter (((title|titleabbrev|subtitle)*, info?), ((glossary|bibliography|index|toc)*, (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(phpdoc:varentry|refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(phpdoc:varentry|refentry)+), (glossary|bibliography|index|toc)*))>
+<!ELEMENT chapter (((title|titleabbrev|subtitle)*, info?), ((glossary|bibliography|index|toc)*, (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(refentry)+), (glossary|bibliography|index|toc)*))>
 
 <!ATTLIST chapter
 	xmlns	CDATA	#FIXED	"http://docbook.org/ns/docbook"
@@ -2608,7 +2608,7 @@
 
 >
 
-<!ELEMENT part (((title|titleabbrev|subtitle)*, info?), partintro?, (glossary|bibliography|index|toc|dedication|acknowledgements|preface|chapter|appendix|article|colophon|phpdoc:varentry|refentry|reference|phpdoc:exceptionref|phpdoc:classref)+)>
+<!ELEMENT part (((title|titleabbrev|subtitle)*, info?), partintro?, (glossary|bibliography|index|toc|dedication|acknowledgements|preface|chapter|appendix|article|colophon|refentry|reference|phpdoc:exceptionref|phpdoc:classref)+)>
 
 <!ATTLIST part
 	xmlns	CDATA	#FIXED	"http://docbook.org/ns/docbook"
@@ -2620,7 +2620,7 @@
 
 >
 
-<!ELEMENT preface (((title|titleabbrev|subtitle)*, info?), ((glossary|bibliography|index|toc)*, (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(phpdoc:varentry|refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(phpdoc:varentry|refentry)+), (glossary|bibliography|index|toc)*))>
+<!ELEMENT preface (((title|titleabbrev|subtitle)*, info?), ((glossary|bibliography|index|toc)*, (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(refentry)+), (glossary|bibliography|index|toc)*))>
 
 <!ATTLIST preface
 	xmlns	CDATA	#FIXED	"http://docbook.org/ns/docbook"
@@ -2632,7 +2632,7 @@
 
 >
 
-<!ELEMENT partintro (((title|titleabbrev|subtitle)*, info?), (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(phpdoc:varentry|refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(phpdoc:varentry|refentry)+))>
+<!ELEMENT partintro (((title|titleabbrev|subtitle)*, info?), (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(refentry)+))>
 
 <!ATTLIST partintro
 	xmlns	CDATA	#FIXED	"http://docbook.org/ns/docbook"
@@ -2644,7 +2644,7 @@
 
 >
 
-<!ELEMENT section (((title|titleabbrev|subtitle)*, info?), (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|(phpdoc:varentry|refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|(phpdoc:varentry|refentry|xi:include)+), (glossary|bibliography|index|toc)*)>
+<!ELEMENT section (((title|titleabbrev|subtitle)*, info?), (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|(refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|(refentry|xi:include)+), (glossary|bibliography|index|toc)*)>
 
 <!ATTLIST section
 	xmlns	CDATA	#FIXED	"http://docbook.org/ns/docbook"
@@ -2668,7 +2668,7 @@
 
 >
 
-<!ELEMENT article (((title|titleabbrev|subtitle)*, info?), (glossary|bibliography|index|toc|appendix|acknowledgements|colophon)*, (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(phpdoc:varentry|refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(phpdoc:varentry|refentry)+), (glossary|bibliography|index|toc|appendix|acknowledgements|colophon)*)>
+<!ELEMENT article (((title|titleabbrev|subtitle)*, info?), (glossary|bibliography|index|toc|appendix|acknowledgements|colophon)*, (((itemizedlist|orderedlist|procedure|simplelist|variablelist|segmentedlist|glosslist|bibliolist|calloutlist|qandaset|caution|important|note|tip|warning|example|figure|table|equation|informalexample|informalfigure|informaltable|informalequation|sidebar|blockquote|address|epigraph|mediaobject|screenshot|task|productionset|constraintdef|msgset|programlisting|screen|literallayout|synopsis|programlistingco|screenco|cmdsynopsis|funcsynopsis|classsynopsis|methodsynopsis|constructorsynopsis|destructorsynopsis|fieldsynopsis|bridgehead|remark|revhistory|indexterm|anchor|para|formalpara|simpara|annotation)+, (((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(refentry)+)?)|((section)+, (simplesect)*)|(simplesect)+|((sect1)+, (simplesect)*)|(refentry)+), (glossary|bibliography|index|toc|appendix|acknowledgements|colophon)*)>
 
 <!ATTLIST article
 	xmlns	CDATA	#FIXED	"http://docbook.org/ns/docbook"
@@ -2741,7 +2741,7 @@
 
 >
 
-<!ELEMENT reference (((title|titleabbrev|subtitle)*, info?), partintro?, (phpdoc:varentry|refentry)+)>
+<!ELEMENT reference (((title|titleabbrev|subtitle)*, info?), partintro?, (refentry)+)>
 
 <!ATTLIST reference
 	xmlns	CDATA	#FIXED	"http://docbook.org/ns/docbook"
@@ -2753,7 +2753,7 @@
 
 >
 
-<!ELEMENT classref (((title|titleabbrev|subtitle)*, info?), partintro?, (phpdoc:varentry|refentry)*)>
+<!ELEMENT classref (((title|titleabbrev|subtitle)*, info?), partintro?, (refentry)*)>
 
 <!ATTLIST classref
 	xmlns	CDATA	#FIXED	"http://docbook.org/ns/docbook"
@@ -2773,7 +2773,7 @@
 >
 <!ELEMENT fallback EMPTY>
 
-<!ELEMENT exceptionref (((title|titleabbrev|subtitle)*, info?), partintro?, (phpdoc:varentry|refentry)*)>
+<!ELEMENT exceptionref (((title|titleabbrev|subtitle)*, info?), partintro?, (refentry)*)>
 
 <!ATTLIST exceptionref
 	xmlns	CDATA	#FIXED	"http://docbook.org/ns/docbook"

Original file line number	Diff line number	Diff line change
`@@ -2332,7 +2332,7 @@`
`2332`	`2332`	`role CDATA #IMPLIED`
`2333`	`2333`	`%db.common.attributes;`
`2334`	`2334`	`%db.common.linking.attributes;`
`2335`		`- pubwork (article\|bbs\|book\|cdrom\|chapter\|dvd\|emailmessage\|gopher\|journal\|manuscript\|newsposting\|part\|phpdoc:varentry\|refentry\|section\|series\|set\|webpage\|wiki) #IMPLIED`
	`2335`	`+ pubwork (article\|bbs\|book\|cdrom\|chapter\|dvd\|emailmessage\|gopher\|journal\|manuscript\|newsposting\|part\|refentry\|section\|series\|set\|webpage\|wiki) #IMPLIED`
`2336`	`2336`
`2337`	`2337`	`>`
`2338`	`2338`
`@@ -2584,7 +2584,7 @@`
`2584`	`2584`
`2585`	`2585`	`>`
`2586`	`2586`
`2587`		-<!ELEMENT appendix (((title\|titleabbrev\|subtitle), info?), ((glossary\|bibliography\|index\|toc), (((itemizedlist\|orderedlist\|procedure\|simplelist\|variablelist\|segmentedlist\|glosslist\|bibliolist\|calloutlist\|qandaset\|caution\|important\|note\|tip\|warning\|example\|figure\|table\|equation\|informalexample\|informalfigure\|informaltable\|informalequation\|sidebar\|blockquote\|address\|epigraph\|mediaobject\|screenshot\|task\|productionset\|constraintdef\|msgset\|programlisting\|screen\|literallayout\|synopsis\|programlistingco\|screenco\|cmdsynopsis\|funcsynopsis\|classsynopsis\|methodsynopsis\|constructorsynopsis\|destructorsynopsis\|fieldsynopsis\|bridgehead\|remark\|revhistory\|indexterm\|anchor\|para\|formalpara\|simpara\|annotation)+, (((section)+, (simplesect))\|(simplesect)+\|((sect1)+, (simplesect))\|(phpdoc:varentry\|refentry)+)?)\|((section)+, (simplesect))\|(simplesect)+\|((sect1)+, (simplesect))\|(phpdoc:varentry\|refentry)+), (glossary\|bibliography\|index\|toc)*))>
	`2587`	+<!ELEMENT appendix (((title\|titleabbrev\|subtitle), info?), ((glossary\|bibliography\|index\|toc), (((itemizedlist\|orderedlist\|procedure\|simplelist\|variablelist\|segmentedlist\|glosslist\|bibliolist\|calloutlist\|qandaset\|caution\|important\|note\|tip\|warning\|example\|figure\|table\|equation\|informalexample\|informalfigure\|informaltable\|informalequation\|sidebar\|blockquote\|address\|epigraph\|mediaobject\|screenshot\|task\|productionset\|constraintdef\|msgset\|programlisting\|screen\|literallayout\|synopsis\|programlistingco\|screenco\|cmdsynopsis\|funcsynopsis\|classsynopsis\|methodsynopsis\|constructorsynopsis\|destructorsynopsis\|fieldsynopsis\|bridgehead\|remark\|revhistory\|indexterm\|anchor\|para\|formalpara\|simpara\|annotation)+, (((section)+, (simplesect))\|(simplesect)+\|((sect1)+, (simplesect))\|(refentry)+)?)\|((section)+, (simplesect))\|(simplesect)+\|((sect1)+, (simplesect))\|(refentry)+), (glossary\|bibliography\|index\|toc)*))>
`2588`	`2588`
`2589`	`2589`	`<!ATTLIST appendix`
`2590`	`2590`	`xmlns CDATA #FIXED "http://docbook.org/ns/docbook"`
`@@ -2596,7 +2596,7 @@`
`2596`	`2596`
`2597`	`2597`	`>`
`2598`	`2598`
`2599`		-<!ELEMENT chapter (((title\|titleabbrev\|subtitle), info?), ((glossary\|bibliography\|index\|toc), (((itemizedlist\|orderedlist\|procedure\|simplelist\|variablelist\|segmentedlist\|glosslist\|bibliolist\|calloutlist\|qandaset\|caution\|important\|note\|tip\|warning\|example\|figure\|table\|equation\|informalexample\|informalfigure\|informaltable\|informalequation\|sidebar\|blockquote\|address\|epigraph\|mediaobject\|screenshot\|task\|productionset\|constraintdef\|msgset\|programlisting\|screen\|literallayout\|synopsis\|programlistingco\|screenco\|cmdsynopsis\|funcsynopsis\|classsynopsis\|methodsynopsis\|constructorsynopsis\|destructorsynopsis\|fieldsynopsis\|bridgehead\|remark\|revhistory\|indexterm\|anchor\|para\|formalpara\|simpara\|annotation)+, (((section)+, (simplesect))\|(simplesect)+\|((sect1)+, (simplesect))\|(phpdoc:varentry\|refentry)+)?)\|((section)+, (simplesect))\|(simplesect)+\|((sect1)+, (simplesect))\|(phpdoc:varentry\|refentry)+), (glossary\|bibliography\|index\|toc)*))>
	`2599`	+<!ELEMENT chapter (((title\|titleabbrev\|subtitle), info?), ((glossary\|bibliography\|index\|toc), (((itemizedlist\|orderedlist\|procedure\|simplelist\|variablelist\|segmentedlist\|glosslist\|bibliolist\|calloutlist\|qandaset\|caution\|important\|note\|tip\|warning\|example\|figure\|table\|equation\|informalexample\|informalfigure\|informaltable\|informalequation\|sidebar\|blockquote\|address\|epigraph\|mediaobject\|screenshot\|task\|productionset\|constraintdef\|msgset\|programlisting\|screen\|literallayout\|synopsis\|programlistingco\|screenco\|cmdsynopsis\|funcsynopsis\|classsynopsis\|methodsynopsis\|constructorsynopsis\|destructorsynopsis\|fieldsynopsis\|bridgehead\|remark\|revhistory\|indexterm\|anchor\|para\|formalpara\|simpara\|annotation)+, (((section)+, (simplesect))\|(simplesect)+\|((sect1)+, (simplesect))\|(refentry)+)?)\|((section)+, (simplesect))\|(simplesect)+\|((sect1)+, (simplesect))\|(refentry)+), (glossary\|bibliography\|index\|toc)*))>
`2600`	`2600`
`2601`	`2601`	`<!ATTLIST chapter`
`2602`	`2602`	`xmlns CDATA #FIXED "http://docbook.org/ns/docbook"`
`@@ -2608,7 +2608,7 @@`
`2608`	`2608`
`2609`	`2609`	`>`
`2610`	`2610`
`2611`		`-<!ELEMENT part (((title\|titleabbrev\|subtitle)*, info?), partintro?, (glossary\|bibliography\|index\|toc\|dedication\|acknowledgements\|preface\|chapter\|appendix\|article\|colophon\|phpdoc:varentry\|refentry\|reference\|phpdoc:exceptionref\|phpdoc:classref)+)>`
	`2611`	`+<!ELEMENT part (((title\|titleabbrev\|subtitle)*, info?), partintro?, (glossary\|bibliography\|index\|toc\|dedication\|acknowledgements\|preface\|chapter\|appendix\|article\|colophon\|refentry\|reference\|phpdoc:exceptionref\|phpdoc:classref)+)>`
`2612`	`2612`
`2613`	`2613`	`<!ATTLIST part`
`2614`	`2614`	`xmlns CDATA #FIXED "http://docbook.org/ns/docbook"`
`@@ -2620,7 +2620,7 @@`
`2620`	`2620`
`2621`	`2621`	`>`
`2622`	`2622`
`2623`		-<!ELEMENT preface (((title\|titleabbrev\|subtitle), info?), ((glossary\|bibliography\|index\|toc), (((itemizedlist\|orderedlist\|procedure\|simplelist\|variablelist\|segmentedlist\|glosslist\|bibliolist\|calloutlist\|qandaset\|caution\|important\|note\|tip\|warning\|example\|figure\|table\|equation\|informalexample\|informalfigure\|informaltable\|informalequation\|sidebar\|blockquote\|address\|epigraph\|mediaobject\|screenshot\|task\|productionset\|constraintdef\|msgset\|programlisting\|screen\|literallayout\|synopsis\|programlistingco\|screenco\|cmdsynopsis\|funcsynopsis\|classsynopsis\|methodsynopsis\|constructorsynopsis\|destructorsynopsis\|fieldsynopsis\|bridgehead\|remark\|revhistory\|indexterm\|anchor\|para\|formalpara\|simpara\|annotation)+, (((section)+, (simplesect))\|(simplesect)+\|((sect1)+, (simplesect))\|(phpdoc:varentry\|refentry)+)?)\|((section)+, (simplesect))\|(simplesect)+\|((sect1)+, (simplesect))\|(phpdoc:varentry\|refentry)+), (glossary\|bibliography\|index\|toc)*))>
	`2623`	+<!ELEMENT preface (((title\|titleabbrev\|subtitle), info?), ((glossary\|bibliography\|index\|toc), (((itemizedlist\|orderedlist\|procedure\|simplelist\|variablelist\|segmentedlist\|glosslist\|bibliolist\|calloutlist\|qandaset\|caution\|important\|note\|tip\|warning\|example\|figure\|table\|equation\|informalexample\|informalfigure\|informaltable\|informalequation\|sidebar\|blockquote\|address\|epigraph\|mediaobject\|screenshot\|task\|productionset\|constraintdef\|msgset\|programlisting\|screen\|literallayout\|synopsis\|programlistingco\|screenco\|cmdsynopsis\|funcsynopsis\|classsynopsis\|methodsynopsis\|constructorsynopsis\|destructorsynopsis\|fieldsynopsis\|bridgehead\|remark\|revhistory\|indexterm\|anchor\|para\|formalpara\|simpara\|annotation)+, (((section)+, (simplesect))\|(simplesect)+\|((sect1)+, (simplesect))\|(refentry)+)?)\|((section)+, (simplesect))\|(simplesect)+\|((sect1)+, (simplesect))\|(refentry)+), (glossary\|bibliography\|index\|toc)*))>
`2624`	`2624`
`2625`	`2625`	`<!ATTLIST preface`
`2626`	`2626`	`xmlns CDATA #FIXED "http://docbook.org/ns/docbook"`
`@@ -2632,7 +2632,7 @@`
`2632`	`2632`
`2633`	`2633`	`>`
`2634`	`2634`
`2635`		-<!ELEMENT partintro (((title\|titleabbrev\|subtitle), info?), (((itemizedlist\|orderedlist\|procedure\|simplelist\|variablelist\|segmentedlist\|glosslist\|bibliolist\|calloutlist\|qandaset\|caution\|important\|note\|tip\|warning\|example\|figure\|table\|equation\|informalexample\|informalfigure\|informaltable\|informalequation\|sidebar\|blockquote\|address\|epigraph\|mediaobject\|screenshot\|task\|productionset\|constraintdef\|msgset\|programlisting\|screen\|literallayout\|synopsis\|programlistingco\|screenco\|cmdsynopsis\|funcsynopsis\|classsynopsis\|methodsynopsis\|constructorsynopsis\|destructorsynopsis\|fieldsynopsis\|bridgehead\|remark\|revhistory\|indexterm\|anchor\|para\|formalpara\|simpara\|annotation)+, (((section)+, (simplesect))\|(simplesect)+\|((sect1)+, (simplesect))\|(phpdoc:varentry\|refentry)+)?)\|((section)+, (simplesect))\|(simplesect)+\|((sect1)+, (simplesect)*)\|(phpdoc:varentry\|refentry)+))>
	`2635`	+<!ELEMENT partintro (((title\|titleabbrev\|subtitle), info?), (((itemizedlist\|orderedlist\|procedure\|simplelist\|variablelist\|segmentedlist\|glosslist\|bibliolist\|calloutlist\|qandaset\|caution\|important\|note\|tip\|warning\|example\|figure\|table\|equation\|informalexample\|informalfigure\|informaltable\|informalequation\|sidebar\|blockquote\|address\|epigraph\|mediaobject\|screenshot\|task\|productionset\|constraintdef\|msgset\|programlisting\|screen\|literallayout\|synopsis\|programlistingco\|screenco\|cmdsynopsis\|funcsynopsis\|classsynopsis\|methodsynopsis\|constructorsynopsis\|destructorsynopsis\|fieldsynopsis\|bridgehead\|remark\|revhistory\|indexterm\|anchor\|para\|formalpara\|simpara\|annotation)+, (((section)+, (simplesect))\|(simplesect)+\|((sect1)+, (simplesect))\|(refentry)+)?)\|((section)+, (simplesect))\|(simplesect)+\|((sect1)+, (simplesect)*)\|(refentry)+))>
`2636`	`2636`
`2637`	`2637`	`<!ATTLIST partintro`
`2638`	`2638`	`xmlns CDATA #FIXED "http://docbook.org/ns/docbook"`
`@@ -2644,7 +2644,7 @@`
`2644`	`2644`
`2645`	`2645`	`>`
`2646`	`2646`
`2647`		-<!ELEMENT section (((title\|titleabbrev\|subtitle), info?), (((itemizedlist\|orderedlist\|procedure\|simplelist\|variablelist\|segmentedlist\|glosslist\|bibliolist\|calloutlist\|qandaset\|caution\|important\|note\|tip\|warning\|example\|figure\|table\|equation\|informalexample\|informalfigure\|informaltable\|informalequation\|sidebar\|blockquote\|address\|epigraph\|mediaobject\|screenshot\|task\|productionset\|constraintdef\|msgset\|programlisting\|screen\|literallayout\|synopsis\|programlistingco\|screenco\|cmdsynopsis\|funcsynopsis\|classsynopsis\|methodsynopsis\|constructorsynopsis\|destructorsynopsis\|fieldsynopsis\|bridgehead\|remark\|revhistory\|indexterm\|anchor\|para\|formalpara\|simpara\|annotation)+, (((section)+, (simplesect))\|(simplesect)+\|(phpdoc:varentry\|refentry)+)?)\|((section)+, (simplesect))\|(simplesect)+\|(phpdoc:varentry\|refentry\|xi:include)+), (glossary\|bibliography\|index\|toc))>
	`2647`	+<!ELEMENT section (((title\|titleabbrev\|subtitle), info?), (((itemizedlist\|orderedlist\|procedure\|simplelist\|variablelist\|segmentedlist\|glosslist\|bibliolist\|calloutlist\|qandaset\|caution\|important\|note\|tip\|warning\|example\|figure\|table\|equation\|informalexample\|informalfigure\|informaltable\|informalequation\|sidebar\|blockquote\|address\|epigraph\|mediaobject\|screenshot\|task\|productionset\|constraintdef\|msgset\|programlisting\|screen\|literallayout\|synopsis\|programlistingco\|screenco\|cmdsynopsis\|funcsynopsis\|classsynopsis\|methodsynopsis\|constructorsynopsis\|destructorsynopsis\|fieldsynopsis\|bridgehead\|remark\|revhistory\|indexterm\|anchor\|para\|formalpara\|simpara\|annotation)+, (((section)+, (simplesect))\|(simplesect)+\|(refentry)+)?)\|((section)+, (simplesect))\|(simplesect)+\|(refentry\|xi:include)+), (glossary\|bibliography\|index\|toc))>
`2648`	`2648`
`2649`	`2649`	`<!ATTLIST section`
`2650`	`2650`	`xmlns CDATA #FIXED "http://docbook.org/ns/docbook"`
`@@ -2668,7 +2668,7 @@`
`2668`	`2668`
`2669`	`2669`	`>`
`2670`	`2670`
`2671`		-<!ELEMENT article (((title\|titleabbrev\|subtitle), info?), (glossary\|bibliography\|index\|toc\|appendix\|acknowledgements\|colophon), (((itemizedlist\|orderedlist\|procedure\|simplelist\|variablelist\|segmentedlist\|glosslist\|bibliolist\|calloutlist\|qandaset\|caution\|important\|note\|tip\|warning\|example\|figure\|table\|equation\|informalexample\|informalfigure\|informaltable\|informalequation\|sidebar\|blockquote\|address\|epigraph\|mediaobject\|screenshot\|task\|productionset\|constraintdef\|msgset\|programlisting\|screen\|literallayout\|synopsis\|programlistingco\|screenco\|cmdsynopsis\|funcsynopsis\|classsynopsis\|methodsynopsis\|constructorsynopsis\|destructorsynopsis\|fieldsynopsis\|bridgehead\|remark\|revhistory\|indexterm\|anchor\|para\|formalpara\|simpara\|annotation)+, (((section)+, (simplesect))\|(simplesect)+\|((sect1)+, (simplesect))\|(phpdoc:varentry\|refentry)+)?)\|((section)+, (simplesect))\|(simplesect)+\|((sect1)+, (simplesect))\|(phpdoc:varentry\|refentry)+), (glossary\|bibliography\|index\|toc\|appendix\|acknowledgements\|colophon)*)>
	`2671`	+<!ELEMENT article (((title\|titleabbrev\|subtitle), info?), (glossary\|bibliography\|index\|toc\|appendix\|acknowledgements\|colophon), (((itemizedlist\|orderedlist\|procedure\|simplelist\|variablelist\|segmentedlist\|glosslist\|bibliolist\|calloutlist\|qandaset\|caution\|important\|note\|tip\|warning\|example\|figure\|table\|equation\|informalexample\|informalfigure\|informaltable\|informalequation\|sidebar\|blockquote\|address\|epigraph\|mediaobject\|screenshot\|task\|productionset\|constraintdef\|msgset\|programlisting\|screen\|literallayout\|synopsis\|programlistingco\|screenco\|cmdsynopsis\|funcsynopsis\|classsynopsis\|methodsynopsis\|constructorsynopsis\|destructorsynopsis\|fieldsynopsis\|bridgehead\|remark\|revhistory\|indexterm\|anchor\|para\|formalpara\|simpara\|annotation)+, (((section)+, (simplesect))\|(simplesect)+\|((sect1)+, (simplesect))\|(refentry)+)?)\|((section)+, (simplesect))\|(simplesect)+\|((sect1)+, (simplesect))\|(refentry)+), (glossary\|bibliography\|index\|toc\|appendix\|acknowledgements\|colophon)*)>
`2672`	`2672`
`2673`	`2673`	`<!ATTLIST article`
`2674`	`2674`	`xmlns CDATA #FIXED "http://docbook.org/ns/docbook"`
`@@ -2741,7 +2741,7 @@`
`2741`	`2741`
`2742`	`2742`	`>`
`2743`	`2743`
`2744`		`-<!ELEMENT reference (((title\|titleabbrev\|subtitle)*, info?), partintro?, (phpdoc:varentry\|refentry)+)>`
	`2744`	`+<!ELEMENT reference (((title\|titleabbrev\|subtitle)*, info?), partintro?, (refentry)+)>`
`2745`	`2745`
`2746`	`2746`	`<!ATTLIST reference`
`2747`	`2747`	`xmlns CDATA #FIXED "http://docbook.org/ns/docbook"`
`@@ -2753,7 +2753,7 @@`
`2753`	`2753`
`2754`	`2754`	`>`
`2755`	`2755`
`2756`		`-<!ELEMENT classref (((title\|titleabbrev\|subtitle), info?), partintro?, (phpdoc:varentry\|refentry))>`
	`2756`	`+<!ELEMENT classref (((title\|titleabbrev\|subtitle), info?), partintro?, (refentry))>`
`2757`	`2757`
`2758`	`2758`	`<!ATTLIST classref`
`2759`	`2759`	`xmlns CDATA #FIXED "http://docbook.org/ns/docbook"`
`@@ -2773,7 +2773,7 @@`
`2773`	`2773`	`>`
`2774`	`2774`	`<!ELEMENT fallback EMPTY>`
`2775`	`2775`
`2776`		`-<!ELEMENT exceptionref (((title\|titleabbrev\|subtitle), info?), partintro?, (phpdoc:varentry\|refentry))>`
	`2776`	`+<!ELEMENT exceptionref (((title\|titleabbrev\|subtitle), info?), partintro?, (refentry))>`
`2777`	`2777`
`2778`	`2778`	`<!ATTLIST exceptionref`
`2779`	`2779`	`xmlns CDATA #FIXED "http://docbook.org/ns/docbook"`