svn commit: r44335 - head/share/xml

[Glen Barber]

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, É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 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