aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-08-29 15:09:18 +0200
committerBjörn Gustavsson <[email protected]>2019-04-04 12:30:20 +0200
commitcbef7064ee299f9463c2b6a0a274fe6603aedae9 (patch)
treecc6887b0a2c8dd924848dde7208b31bceef55b2a /lib
parente05c018328cbb0b473817e5d689ba8118442757b (diff)
downloadotp-cbef7064ee299f9463c2b6a0a274fe6603aedae9.tar.gz
otp-cbef7064ee299f9463c2b6a0a274fe6603aedae9.tar.bz2
otp-cbef7064ee299f9463c2b6a0a274fe6603aedae9.zip
erts: Fix more internal docs xmllint
Diffstat (limited to 'lib')
-rw-r--r--lib/compiler/doc/src/Makefile2
-rw-r--r--lib/compiler/doc/src/internal.xml1
-rw-r--r--lib/erl_docgen/priv/dtd/book.dtd3
-rw-r--r--lib/erl_docgen/priv/dtd/common.dtd2
4 files changed, 5 insertions, 3 deletions
diff --git a/lib/compiler/doc/src/Makefile b/lib/compiler/doc/src/Makefile
index 6ef4595ff3..2fb163b9e7 100644
--- a/lib/compiler/doc/src/Makefile
+++ b/lib/compiler/doc/src/Makefile
@@ -51,7 +51,7 @@ XML_FILES = \
$(XML_PART_FILES) $(XML_REF3_FILES) $(XML_APPLICATION_FILES)
XML_INTERNAL_FILES = \
- cerl.xml cerl_trees.xml
+ cerl.xml cerl_trees.xml cerl_clauses.xml
# ----------------------------------------------------
diff --git a/lib/compiler/doc/src/internal.xml b/lib/compiler/doc/src/internal.xml
index 833c788083..f24b363c1c 100644
--- a/lib/compiler/doc/src/internal.xml
+++ b/lib/compiler/doc/src/internal.xml
@@ -33,5 +33,6 @@
</description>
<xi:include href="cerl.xml"/>
<xi:include href="cerl_trees.xml"/>
+ <xi:include href="cerl_clauses.xml"/>
</internal>
diff --git a/lib/erl_docgen/priv/dtd/book.dtd b/lib/erl_docgen/priv/dtd/book.dtd
index aa07d38658..326bf3369a 100644
--- a/lib/erl_docgen/priv/dtd/book.dtd
+++ b/lib/erl_docgen/priv/dtd/book.dtd
@@ -30,7 +30,7 @@
insidecover?,
pagetext,
preamble,
- (applications|parts|headline|pagetext)+,
+ (applications|parts|internals|headline|pagetext)+,
(listoffigures?,
listoftables?,
listofterms?,
@@ -56,6 +56,7 @@
<!ELEMENT applications (include)* >
<!ELEMENT parts (title?,description?,(include|onepart)*) >
<!ATTLIST parts lift (yes|no) "no" >
+<!ELEMENT internals (include)* >
<!ELEMENT headline (#PCDATA) >
<!ELEMENT index EMPTY >
<!ELEMENT listoffigures EMPTY >
diff --git a/lib/erl_docgen/priv/dtd/common.dtd b/lib/erl_docgen/priv/dtd/common.dtd
index b1578ad9d4..0ccd52068b 100644
--- a/lib/erl_docgen/priv/dtd/common.dtd
+++ b/lib/erl_docgen/priv/dtd/common.dtd
@@ -25,7 +25,7 @@
<!ENTITY % block "p|pre|code|list|taglist|codeinclude|
erleval" >
<!ENTITY % inline "#PCDATA|c|i|em|strong|term|cite|br|path|seealso|
- url|marker|anno" >
+ url|marker|anno|image" >
<!-- XXX -->
<!ELEMENT p (%inline;)* >
<!ELEMENT pre (#PCDATA|seealso|url|input|anno)* >