diff options
author | Hans Bolinder <[email protected]> | 2010-12-01 09:09:23 +0100 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2010-12-01 09:09:23 +0100 |
commit | 49b581eaf301f13a1602a5e89b4fb68c3a3d8afe (patch) | |
tree | 5f2661781ac2041ffab0e1d5d6b73624ea94c0d5 /lib/erl_docgen/priv/docbuilder_dtd/common.refs.dtd | |
parent | e2191e8215d6aa4dd09cb06d907841713d45c1f0 (diff) | |
parent | 2f93254d2c929d0563c2ab8152da62ee0a91ea10 (diff) | |
download | otp-49b581eaf301f13a1602a5e89b4fb68c3a3d8afe.tar.gz otp-49b581eaf301f13a1602a5e89b4fb68c3a3d8afe.tar.bz2 otp-49b581eaf301f13a1602a5e89b4fb68c3a3d8afe.zip |
Merge branch 'hb/types_and_specs_for_docs/OTP-8720' into dev
* hb/types_and_specs_for_docs/OTP-8720:
Prepare erl_docgen for using Dialyzer specs and types
Diffstat (limited to 'lib/erl_docgen/priv/docbuilder_dtd/common.refs.dtd')
-rw-r--r-- | lib/erl_docgen/priv/docbuilder_dtd/common.refs.dtd | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/erl_docgen/priv/docbuilder_dtd/common.refs.dtd b/lib/erl_docgen/priv/docbuilder_dtd/common.refs.dtd index 7b9974fbda..c1237766e1 100644 --- a/lib/erl_docgen/priv/docbuilder_dtd/common.refs.dtd +++ b/lib/erl_docgen/priv/docbuilder_dtd/common.refs.dtd @@ -26,15 +26,18 @@ <!ELEMENT description (%block;|quote|br|marker|warning|note)* > <!ELEMENT funcs (func)+ > -<!ELEMENT func (name+,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?)+ > <!ELEMENT v (#PCDATA) > <!ELEMENT d (#PCDATA|c|em)* > -<!ELEMENT desc (%block;|quote|br|marker|warning|note)* > +<!ELEMENT desc (%block;|quote|br|marker|warning|note|anno)* > <!ELEMENT authors (aname,email)+ > <!ELEMENT aname (#PCDATA) > <!ELEMENT email (#PCDATA) > <!ELEMENT section (marker*,title,(%block;|quote|br|marker| warning|note)*) > +<!ELEMENT datatypes (datatype)+ > +<!ELEMENT datatype (name+,desc?) > +<!ELEMENT type_desc (#PCDATA) > |