- Allow email in attribution

- Allow trademark in screen
This commit is contained in:
Gabor Kovesdan 2013-06-20 14:45:27 +00:00
parent 0e4e6a969a
commit a28f1f3d18
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/projects/db5/; revision=41961

View file

@ -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"