diff options
| author | Lars Thorsen <[email protected]> | 2015-12-04 13:08:44 +0100 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2015-12-04 13:08:44 +0100 |
| commit | c5e3f065998057c2bb304d75f9ec00228bacfc36 (patch) | |
| tree | 08538007c14e298db3bd5271fc3026693575c17d /lib/erl_docgen/priv/dtd/common.refs.dtd | |
| parent | 8fa96128d4a02019463d566e635f774e3fca7c67 (diff) | |
| parent | f86828fead59ba0a28658d3f5e7d8dc80f1c73fb (diff) | |
| download | otp-c5e3f065998057c2bb304d75f9ec00228bacfc36.tar.gz otp-c5e3f065998057c2bb304d75f9ec00228bacfc36.tar.bz2 otp-c5e3f065998057c2bb304d75f9ec00228bacfc36.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/erl_docgen/priv/dtd/common.refs.dtd')
| -rw-r--r-- | lib/erl_docgen/priv/dtd/common.refs.dtd | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/erl_docgen/priv/dtd/common.refs.dtd b/lib/erl_docgen/priv/dtd/common.refs.dtd index f57e46a624..6889e990de 100644 --- a/lib/erl_docgen/priv/dtd/common.refs.dtd +++ b/lib/erl_docgen/priv/dtd/common.refs.dtd @@ -27,15 +27,16 @@ <!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) > -<!ELEMENT d (#PCDATA|c|em)* > -<!ELEMENT desc (%block;|quote|br|marker|warning|note|dont|do|anno)* > +<!ELEMENT v (#PCDATA|seealso)* > +<!ELEMENT d (#PCDATA|c|i|em)* > +<!ELEMENT desc (%block;|quote|br|marker|warning|note|dont|do)* > <!ELEMENT authors (aname,email)+ > <!ELEMENT aname (#PCDATA) > <!ELEMENT email (#PCDATA) > @@ -43,5 +44,6 @@ warning|note|dont|do)*) > <!ELEMENT datatypes (datatype)+ > <!ELEMENT datatype (name+,desc?) > -<!ELEMENT type_desc (#PCDATA) > -<!ATTLIST type_desc variable CDATA #REQUIRED> +<!ELEMENT type_desc (#PCDATA|anno|c|seealso)* > +<!ATTLIST type_desc variable CDATA #IMPLIED + name CDATA #IMPLIED> |