From owner-svn-doc-all@FreeBSD.ORG  Sun Mar 23 03:03:30 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 97AD4BD;
 Sun, 23 Mar 2014 03:03:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8408F686;
 Sun, 23 Mar 2014 03:03:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2N33U92054335;
 Sun, 23 Mar 2014 03:03:30 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2N33UAi054334;
 Sun, 23 Mar 2014 03:03:30 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201403230303.s2N33UAi054334@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 23 Mar 2014 03:03:30 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r44335 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Mar 2014 03:03:30 -0000

Author: gjb
Date: Sun Mar 23 03:03:29 2014
New Revision: 44335
URL: http://svnweb.freebsd.org/changeset/doc/44335

Log:
  Move AMD entity to existing amd* entities.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/share/xml/trademarks.ent

Modified: head/share/xml/trademarks.ent
==============================================================================
--- head/share/xml/trademarks.ent	Sun Mar 23 02:33:23 2014	(r44334)
+++ head/share/xml/trademarks.ent	Sun Mar 23 03:03:29 2014	(r44335)
@@ -39,6 +39,7 @@
 <!ENTITY tm-attrib.amd "<para xmlns='http://docbook.org/ns/docbook'>AMD, AMD Athlon,
   AMD Opteron, Athlon, &Eacute;lan, Opteron, and PCnet are
   trademarks of Advanced Micro Devices, Inc.</para>">
+<!ENTITY amd "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>AMD</trademark>">
 <!ENTITY am486 "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Am486</trademark>">
 <!ENTITY am5x86 "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Am5x86</trademark>">
 <!ENTITY amd.athlon "<trademark xmlns='http://docbook.org/ns/docbook'>AMD&nbsp;Athlon</trademark>">
@@ -144,7 +145,6 @@ Coverity, Inc.</para>">
 <!ENTITY ieee "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>IEEE</trademark>">
 <!ENTITY posix "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>POSIX</trademark>">
 
-<!ENTITY amd "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>AMD</trademark>">
 <!-- http://www.intel.com/intel/legal/tmnouns2.htm -->
 <!ENTITY tm-attrib.intel "<para xmlns='http://docbook.org/ns/docbook'>Intel, Celeron, EtherExpress, i386,
   i486, Itanium, Pentium, and Xeon are trademarks or registered