svn commit: r41961 - projects/db5/share/xml

[Gabor Kovesdan]

Author: gabor
Date: Thu Jun 20 14:45:27 2013
New Revision: 41961
URL: http://svnweb.freebsd.org/changeset/doc/41961

Log:
  - Allow email in attribution
  - Allow trademark in screen

Modified:
  projects/db5/share/xml/docbook50.dtd

Modified: projects/db5/share/xml/docbook50.dtd
==============================================================================
--- projects/db5/share/xml/docbook50.dtd	Thu Jun 20 14:23:08 2013	(r41960)
+++ projects/db5/share/xml/docbook50.dtd	Thu Jun 20 14:45:27 2013	(r41961)
@@ -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"