From owner-svn-doc-head@FreeBSD.ORG Tue Oct 8 17:28:08 2013 Return-Path: Delivered-To: svn-doc-head@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 ESMTP id 11338D90; Tue, 8 Oct 2013 17:28:08 +0000 (UTC) (envelope-from gavin@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 F20E722FC; Tue, 8 Oct 2013 17:28:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r98HS7K7050912; Tue, 8 Oct 2013 17:28:07 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r98HS7mQ050911; Tue, 8 Oct 2013 17:28:07 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201310081728.r98HS7mQ050911@svn.freebsd.org> From: Gavin Atkinson Date: Tue, 8 Oct 2013 17:28:07 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r42901 - 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-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Oct 2013 17:28:08 -0000 Author: gavin Date: Tue Oct 8 17:28:07 2013 New Revision: 42901 URL: http://svnweb.freebsd.org/changeset/doc/42901 Log: - Adobe now own the Flash registered trademark. - We don't use the Shockwave trademark anywhere any more, GC it - We don't use the SPARCengine trademark anywhere any more, GC it - Flag trademark entries which are no longer used in the en_US documentation, but continue to be used in other translations. Modified: head/share/xml/trademarks.ent Modified: head/share/xml/trademarks.ent ============================================================================== --- head/share/xml/trademarks.ent Tue Oct 8 17:22:11 2013 (r42900) +++ head/share/xml/trademarks.ent Tue Oct 8 17:28:07 2013 (r42901) @@ -26,13 +26,14 @@ Adaptec, Inc."> Adaptec"> -Adobe, Acrobat, Acrobat Reader, and +Adobe, Acrobat, Acrobat Reader, Flash and PostScript are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries."> Acrobat"> Acrobat Reader"> Adobe"> +Flash"> PostScript"> @@ -208,12 +209,12 @@ Coverity, Inc."> MegaRAID"> Mylex"> + Macromedia, Flash, and Shockwave are trademarks or registered trademarks of Macromedia, Inc. in the United States and/or other countries."> -Flash"> Macromedia"> -Shockwave"> Microsoft, IntelliMouse, MS-DOS, Outlook, Windows, Windows Media and Windows NT are either @@ -257,6 +258,8 @@ Coverity, Inc."> Netscape"> Netscape Navigator"> + GateD and NextHop are registered and unregistered trademarks of NextHop in the U.S. and other @@ -309,6 +312,8 @@ Coverity, Inc."> registered trademarks of Red Hat, Inc. in the United States and other countries."> + SAP, R/3, and mySAP are trademarks or registered trademarks of SAP AG in Germany and in several other countries all over the world."> @@ -326,18 +331,16 @@ Coverity, Inc."> of Patrick Volkerding and Slackware Linux, Inc."> -SPARC, SPARC64, SPARCengine, and +SPARC, SPARC64, and UltraSPARC are trademarks of SPARC International, Inc in the United States and other countries. SPARC International, Inc owns all of the SPARC trademarks and under licensing agreements allows the proper use of these trademarks by its members."> SPARC"> SPARC64"> -SPARCengine"> UltraSPARC"> - Sun, Sun Microsystems, Java, Java Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra, OpenJDK, Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS, @@ -466,6 +469,8 @@ Coverity, Inc."> '> + Legal Notice