From owner-svn-doc-projects@FreeBSD.ORG  Thu Jun 20 14:45:28 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 7F11B917;
 Thu, 20 Jun 2013 14:45:28 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 586881DE4;
 Thu, 20 Jun 2013 14:45:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KEjSl3054744;
 Thu, 20 Jun 2013 14:45:28 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5KEjSdi054743;
 Thu, 20 Jun 2013 14:45:28 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306201445.r5KEjSdi054743@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 20 Jun 2013 14:45:28 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41961 - projects/db5/share/xml
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Jun 2013 14:45:28 -0000

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"