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

[Gabor Kovesdan]

Author: gabor
Date: Thu Nov  7 12:39:24 2013
New Revision: 43118
URL: http://svnweb.freebsd.org/changeset/doc/43118

Log:
  - Readd accidentally deleted entities

Modified:
  projects/db5/share/xml/trademarks.ent

Modified: projects/db5/share/xml/trademarks.ent
==============================================================================
--- projects/db5/share/xml/trademarks.ent	Thu Nov  7 12:38:57 2013	(r43117)
+++ projects/db5/share/xml/trademarks.ent	Thu Nov  7 12:39:24 2013	(r43118)
@@ -39,7 +39,11 @@
 <!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 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>">
+<!ENTITY amd.duron "<trademark xmlns='http://docbook.org/ns/docbook'>AMD Duron</trademark>">
+<!ENTITY amd.k6 "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>AMD-K6</trademark>">
 <!ENTITY amd.opteron "<trademark xmlns='http://docbook.org/ns/docbook'>AMD Opteron</trademark>">
 <!ENTITY athlon "<trademark xmlns='http://docbook.org/ns/docbook'>Athlon</trademark>">
 <!ENTITY elan "<trademark xmlns='http://docbook.org/ns/docbook'>Élan</trademark>">
@@ -108,7 +112,14 @@ Coverity, Inc.</para>">
 <!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD is a registered trademark of
   the FreeBSD Foundation.</para>">
 
+<!-- http://www.fpc.fujitsu.com/www/content/legal_resources/trademarks.php -->
+<!ENTITY tm-attrib.fujitsu "<para xmlns='http://docbook.org/ns/docbook'>Fujitsu, the Fujitsu logo, LifeBook,
+  Stylistic, PRIMEPOWER, PRIMEQUEST, PRIMECLUSTER, ETERNUS, TRIOLE,
+  ESPRIMO, BioMedCAChe, CAChe, CELLINJECTOR, isS, Materials Explorer,
+  SystemWalker, and Interstage are trademarks or registered trademarks
+  of Fujitsu Limited in the United States and other countries.</para>">
 <!ENTITY fujitsu "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Fujitsu</trademark>">
+<!ENTITY primepower "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>PRIMEPOWER</trademark>">
 
 <!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
 <!ENTITY tm-attrib.heidelberger "<para xmlns='http://docbook.org/ns/docbook'>Heidelberg, Helvetica,
@@ -307,8 +318,13 @@ Coverity, Inc.</para>">
 <!ENTITY netra "<trademark xmlns='http://docbook.org/ns/docbook'>Netra</trademark>">
 <!ENTITY openjdk "<trademark xmlns='http://docbook.org/ns/docbook'>OpenJDK</trademark>">
 <!ENTITY solaris "<trademark xmlns='http://docbook.org/ns/docbook'>Solaris</trademark>">
+<!ENTITY sparcengine "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>SPARCEngine</trademark>">
 <!ENTITY staroffice "<trademark xmlns='http://docbook.org/ns/docbook'>StarOffice</trademark>">
 <!ENTITY sun "<trademark xmlns='http://docbook.org/ns/docbook'>Sun</trademark>">
+<!ENTITY sun.blade "<trademark xmlns='http://docbook.org/ns/docbook'>Sun Blade</trademark>">
+<!ENTITY sun.enterprise "<trademark xmlns='http://docbook.org/ns/docbook'>Sun Enterprise</trademark>">
+<!ENTITY sun.fire "<trademark xmlns='http://docbook.org/ns/docbook'>Sun Fire</trademark>">
+<!ENTITY sun.ultra "Sun <trademark xmlns='http://docbook.org/ns/docbook'>Ultra</trademark>">
 <!ENTITY sunos "<trademark xmlns='http://docbook.org/ns/docbook'>SunOS</trademark>">
 <!ENTITY virtualbox "<trademark xmlns='http://docbook.org/ns/docbook'>VirtualBox</trademark>">