From cb431af03a56ac195862289da474947c2107cdde Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars.thorsen@ericsson.com>
Date: Mon, 5 Oct 2015 12:35:27 +0200
Subject: [erl_docgen] Update DTD for anno tag

---
 lib/erl_docgen/priv/dtd/common.refs.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/erl_docgen/priv/dtd/common.refs.dtd')

diff --git a/lib/erl_docgen/priv/dtd/common.refs.dtd b/lib/erl_docgen/priv/dtd/common.refs.dtd
index f57e46a624..a59462bb3f 100644
--- a/lib/erl_docgen/priv/dtd/common.refs.dtd
+++ b/lib/erl_docgen/priv/dtd/common.refs.dtd
@@ -33,9 +33,9 @@
 <!ELEMENT type                (v,d?)* >
 <!ATTLIST type                 variable CDATA #IMPLIED
                                name_i CDATA #IMPLIED>
-<!ELEMENT v                   (#PCDATA) >
+<!ELEMENT v                   (#PCDATA|seealso)* >
 <!ELEMENT d                   (#PCDATA|c|em)* >
-<!ELEMENT desc                (%block;|quote|br|marker|warning|note|dont|do|anno)* >
+<!ELEMENT desc                (%block;|quote|br|marker|warning|note|dont|do)* >
 <!ELEMENT authors             (aname,email)+ >
 <!ELEMENT aname               (#PCDATA) >
 <!ELEMENT email               (#PCDATA) >
@@ -43,5 +43,5 @@
                                warning|note|dont|do)*) >
 <!ELEMENT datatypes           (datatype)+ >
 <!ELEMENT datatype            (name+,desc?) >
-<!ELEMENT type_desc           (#PCDATA) >
+<!ELEMENT type_desc           (#PCDATA|anno)* >
 <!ATTLIST type_desc            variable CDATA #REQUIRED>
-- 
cgit v1.2.3


From 166706fbe4b9c32cd3360addfa4428bc06f78380 Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars.thorsen@ericsson.com>
Date: Fri, 9 Oct 2015 09:19:06 +0200
Subject: [erl_docgen] Correct faults in the dtd

---
 lib/erl_docgen/priv/dtd/common.refs.dtd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/erl_docgen/priv/dtd/common.refs.dtd')

diff --git a/lib/erl_docgen/priv/dtd/common.refs.dtd b/lib/erl_docgen/priv/dtd/common.refs.dtd
index a59462bb3f..a32c34536d 100644
--- a/lib/erl_docgen/priv/dtd/common.refs.dtd
+++ b/lib/erl_docgen/priv/dtd/common.refs.dtd
@@ -27,11 +27,12 @@
 
 <!ELEMENT description         (%block;|quote|br|marker|warning|note|dont|do)* >
 <!ELEMENT funcs               (func)+ >
-<!ELEMENT func                (name+,type_desc*,fsummary,type?,desc?) >
+<!ELEMENT func                (name+,type_desc*,fsummary,type*,desc?) >
 <!-- ELEMENT name is defined in each ref dtd -->
 <!ELEMENT fsummary            (#PCDATA|c|em)* >
 <!ELEMENT type                (v,d?)* >
 <!ATTLIST type                 variable CDATA #IMPLIED
+                               name CDATA #IMPLIED
                                name_i CDATA #IMPLIED>
 <!ELEMENT v                   (#PCDATA|seealso)* >
 <!ELEMENT d                   (#PCDATA|c|em)* >
-- 
cgit v1.2.3


From 39f4c81043c00e2e1284855b07f5181b6ac28841 Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars.thorsen@ericsson.com>
Date: Fri, 16 Oct 2015 12:57:24 +0200
Subject: [erl_docgen] Correct DTD for tags anno, fsummary and add an tag i
 (italic).

---
 lib/erl_docgen/priv/dtd/common.refs.dtd | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'lib/erl_docgen/priv/dtd/common.refs.dtd')

diff --git a/lib/erl_docgen/priv/dtd/common.refs.dtd b/lib/erl_docgen/priv/dtd/common.refs.dtd
index a32c34536d..6889e990de 100644
--- a/lib/erl_docgen/priv/dtd/common.refs.dtd
+++ b/lib/erl_docgen/priv/dtd/common.refs.dtd
@@ -27,15 +27,15 @@
 
 <!ELEMENT description         (%block;|quote|br|marker|warning|note|dont|do)* >
 <!ELEMENT funcs               (func)+ >
-<!ELEMENT func                (name+,type_desc*,fsummary,type*,desc?) >
+<!ELEMENT func                (name+,fsummary,(type|type_desc)*,desc?) >
 <!-- ELEMENT name is defined in each ref dtd -->
-<!ELEMENT fsummary            (#PCDATA|c|em)* >
+<!ELEMENT fsummary            (#PCDATA|c|i|em|anno)* >
 <!ELEMENT type                (v,d?)* >
 <!ATTLIST type                 variable CDATA #IMPLIED
                                name CDATA #IMPLIED
                                name_i CDATA #IMPLIED>
 <!ELEMENT v                   (#PCDATA|seealso)* >
-<!ELEMENT d                   (#PCDATA|c|em)* >
+<!ELEMENT d                   (#PCDATA|c|i|em)* >
 <!ELEMENT desc                (%block;|quote|br|marker|warning|note|dont|do)* >
 <!ELEMENT authors             (aname,email)+ >
 <!ELEMENT aname               (#PCDATA) >
@@ -44,5 +44,6 @@
                                warning|note|dont|do)*) >
 <!ELEMENT datatypes           (datatype)+ >
 <!ELEMENT datatype            (name+,desc?) >
-<!ELEMENT type_desc           (#PCDATA|anno)* >
-<!ATTLIST type_desc            variable CDATA #REQUIRED>
+<!ELEMENT type_desc           (#PCDATA|anno|c|seealso)* >
+<!ATTLIST type_desc            variable CDATA #IMPLIED
+                               name CDATA #IMPLIED>
-- 
cgit v1.2.3