From a28f1f3d180e3908d988b7d5ee495ea92454dd11 Mon Sep 17 00:00:00 2001 From: Gabor Kovesdan <gabor@FreeBSD.org> Date: Thu, 20 Jun 2013 14:45:27 +0000 Subject: [PATCH] - Allow email in attribution - Allow trademark in screen --- share/xml/docbook50.dtd | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/xml/docbook50.dtd b/share/xml/docbook50.dtd index 8b89b023f7..5cebf6d876 100644 --- a/share/xml/docbook50.dtd +++ b/share/xml/docbook50.dtd @@ -228,7 +228,8 @@ > -<!ELEMENT attribution (#PCDATA|inlinemediaobject|remark|superscript|subscript|xref|link|olink|anchor|biblioref|alt|annotation|indexterm|phrase|replaceable|person|personname|citetitle|citation)*> +<!ELEMENT attribution (#PCDATA|inlinemediaobject|remark|superscript|subscript|xref|link|olink|anchor|biblioref|alt|annotation|indexterm|phrase|replaceable|person|personname|citetitle|citation| + email)*> <!ATTLIST attribution xmlns CDATA #FIXED "http://docbook.org/ns/docbook" @@ -487,7 +488,7 @@ > <!ELEMENT screen (#PCDATA|info|textobject|inlinemediaobject|remark|superscript|subscript|xref|link|olink|anchor|biblioref|alt|annotation|indexterm|abbrev|acronym|date|emphasis|footnote|footnoteref|foreignphrase|phrase|quote|wordasword|firstterm|glossterm|coref|trademark|productnumber|productname|database|application|hardware|citation|citerefentry|citetitle|citebiblioid|author|person|personname|org|orgname|editor|jobtitle|replaceable|package|parameter|termdef|nonterminal|systemitem|option|optional|property|inlineequation|tag|markup|token|symbol|literal|code|constant|email|uri|guiicon|guibutton|guimenuitem|guimenu|guisubmenu|guilabel|menuchoice|mousebutton|keycombo|keycap|keycode|keysym|shortcut|accel|prompt|envar|filename|command|computeroutput|userinput|function|varname|returnvalue|type|classname|exceptionname|interfacename|methodname|modifier|initializer|ooclass|ooexception|oointerface|errorcode|errortext|errorname|errortype|lineannotation|co| - xi:include)*> + trademark|xi:include)*> <!ATTLIST screen xmlns CDATA #FIXED "http://docbook.org/ns/docbook"