diff options
| author | Lars Thorsen <[email protected]> | 2016-06-01 14:39:04 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2016-06-01 14:39:04 +0200 |
| commit | 9cbdf29184f4dd54c0b332c153809c0cfa9dbd69 (patch) | |
| tree | aa5fadcfc0a56462188df418a9f9f8203a8967a7 /lib/erl_docgen/priv/dtd | |
| parent | d7e91348bc49a8f46a4d8223d522e2d92469f6da (diff) | |
| parent | bd52bd5e8082f358b84694ef45a8f44358d1a35c (diff) | |
| download | otp-9cbdf29184f4dd54c0b332c153809c0cfa9dbd69.tar.gz otp-9cbdf29184f4dd54c0b332c153809c0cfa9dbd69.tar.bz2 otp-9cbdf29184f4dd54c0b332c153809c0cfa9dbd69.zip | |
Merge branch 'lars/system-doc-xmllint-errors/OTP-13638'
* lars/system-doc-xmllint-errors/OTP-13638:
[erl_docgen] Fix anchor bug for sections in ref manuals
Remove usage of non dtd defined tag (<output>)
[erl_docgen] Fix support for quote tag
[erl_docgen] Correct the handling of marker tags
Correct usage of marker tag
[erl_docgen] Add new formatting for header level 4 and below
Make it possible to run xmllint target in system documentation
Diffstat (limited to 'lib/erl_docgen/priv/dtd')
| -rw-r--r-- | lib/erl_docgen/priv/dtd/common.dtd | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/erl_docgen/priv/dtd/common.dtd b/lib/erl_docgen/priv/dtd/common.dtd index 961bcd3fc2..b1578ad9d4 100644 --- a/lib/erl_docgen/priv/dtd/common.dtd +++ b/lib/erl_docgen/priv/dtd/common.dtd @@ -12,7 +12,7 @@ limitations under the License. The Initial Developer of the Original Code is Ericsson AB. - Portions created by Ericsson are Copyright 1999-2007, Ericsson AB. + Portions created by Ericsson are Copyright 1999-2016, Ericsson AB. All Rights Reserved.'' $Id$ @@ -24,7 +24,7 @@ <!ENTITY % block "p|pre|code|list|taglist|codeinclude| erleval" > -<!ENTITY % inline "#PCDATA|c|i|em|term|cite|br|path|seealso| +<!ENTITY % inline "#PCDATA|c|i|em|strong|term|cite|br|path|seealso| url|marker|anno" > <!-- XXX --> <!ELEMENT p (%inline;)* > @@ -40,6 +40,7 @@ <!ELEMENT c (#PCDATA|anno)* > <!ELEMENT i (#PCDATA|c|anno)* > <!ELEMENT em (#PCDATA|c|anno)* > +<!ELEMENT strong (#PCDATA|c|anno)* > <!ELEMENT anno (#PCDATA) > <!-- XXX --> @@ -68,7 +69,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;|warning|note|dont|do)* > +<!ELEMENT item (%inline;|%block;|warning|note|dont|do|quote)* > <!-- References --> |