From owner-svn-doc-projects@FreeBSD.ORG  Thu Nov  7 12:39:24 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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id CA735655;
 Thu,  7 Nov 2013 12:39:24 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
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 B73A62B6A;
 Thu,  7 Nov 2013 12:39:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA7CdO2f074157;
 Thu, 7 Nov 2013 12:39:24 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA7CdOnG074156;
 Thu, 7 Nov 2013 12:39:24 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201311071239.rA7CdOnG074156@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 7 Nov 2013 12:39:24 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r43118 - 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, 07 Nov 2013 12:39:25 -0000

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, &Eacute;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&nbsp;Athlon</trademark>">
+<!ENTITY amd.duron "<trademark xmlns='http://docbook.org/ns/docbook'>AMD&nbsp;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&nbsp;Opteron</trademark>">
 <!ENTITY athlon "<trademark xmlns='http://docbook.org/ns/docbook'>Athlon</trademark>">
 <!ENTITY elan "<trademark xmlns='http://docbook.org/ns/docbook'>&Eacute;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&nbsp;Blade</trademark>">
+<!ENTITY sun.enterprise "<trademark xmlns='http://docbook.org/ns/docbook'>Sun&nbsp;Enterprise</trademark>">
+<!ENTITY sun.fire "<trademark xmlns='http://docbook.org/ns/docbook'>Sun&nbsp;Fire</trademark>">
+<!ENTITY sun.ultra "Sun&nbsp;<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>">