aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Thorsen <[email protected]>2015-12-11 10:06:11 +0100
committerLars Thorsen <[email protected]>2015-12-11 10:06:11 +0100
commit6288a8610ae9fb0f1aa9ebfe0fe1b46ff87c3668 (patch)
tree2125edf7e0fad6bdf5b25899939f439bd3090c9c
parentd314004b94edd379b873d077f05570e6a90de072 (diff)
parent8c276c8c804e8cefb9f88d6bc6449916c3ec3a82 (diff)
downloadotp-6288a8610ae9fb0f1aa9ebfe0fe1b46ff87c3668.tar.gz
otp-6288a8610ae9fb0f1aa9ebfe0fe1b46ff87c3668.tar.bz2
otp-6288a8610ae9fb0f1aa9ebfe0fe1b46ff87c3668.zip
Merge branch 'maint'
-rw-r--r--lib/erl_docgen/priv/dtd/common.dtd2
-rw-r--r--lib/erl_docgen/priv/dtd/common.refs.dtd4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/erl_docgen/priv/dtd/common.dtd b/lib/erl_docgen/priv/dtd/common.dtd
index a29fc233fa..961bcd3fc2 100644
--- a/lib/erl_docgen/priv/dtd/common.dtd
+++ b/lib/erl_docgen/priv/dtd/common.dtd
@@ -68,7 +68,7 @@
<!ATTLIST list type (ordered|bulleted) "bulleted" >
<!ELEMENT taglist (tag,item+)+ >
<!ELEMENT tag (#PCDATA|c|i|em|br|seealso|url|marker|anno)* >
-<!ELEMENT item (%inline;|%block;)* >
+<!ELEMENT item (%inline;|%block;|warning|note|dont|do)* >
<!-- References -->
diff --git a/lib/erl_docgen/priv/dtd/common.refs.dtd b/lib/erl_docgen/priv/dtd/common.refs.dtd
index 6889e990de..4f87007a09 100644
--- a/lib/erl_docgen/priv/dtd/common.refs.dtd
+++ b/lib/erl_docgen/priv/dtd/common.refs.dtd
@@ -35,13 +35,13 @@
name CDATA #IMPLIED
name_i CDATA #IMPLIED>
<!ELEMENT v (#PCDATA|seealso)* >
-<!ELEMENT d (#PCDATA|c|i|em)* >
+<!ELEMENT d (#PCDATA|seealso|c|i|em)* >
<!ELEMENT desc (%block;|quote|br|marker|warning|note|dont|do)* >
<!ELEMENT authors (aname,email)+ >
<!ELEMENT aname (#PCDATA) >
<!ELEMENT email (#PCDATA) >
<!ELEMENT section (marker*,title,(%block;|quote|br|marker|
- warning|note|dont|do)*) >
+ warning|note|dont|do|section)*) >
<!ELEMENT datatypes (datatype)+ >
<!ELEMENT datatype (name+,desc?) >
<!ELEMENT type_desc (#PCDATA|anno|c|seealso)* >