Date: Tue, 8 Oct 2013 17:28:07 +0000 (UTC) From: Gavin Atkinson <gavin@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r42901 - head/share/xml Message-ID: <201310081728.r98HS7mQ050911@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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.</para>"> <!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>"> -<!ENTITY tm-attrib.adobe "<para>Adobe, Acrobat, Acrobat Reader, and +<!ENTITY tm-attrib.adobe "<para>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.</para>"> <!ENTITY acrobat "<trademark class='registered'>Acrobat</trademark>"> <!ENTITY acrobat.reader "<trademark class='registered'>Acrobat Reader</trademark>"> <!ENTITY adobe "<trademark class='registered'>Adobe</trademark>"> +<!ENTITY flash "<trademark class='registered'>Flash</trademark>"> <!ENTITY postscript "<trademark class='registered'>PostScript</trademark>"> <!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html --> @@ -208,12 +209,12 @@ Coverity, Inc.</para>"> <!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>"> <!ENTITY mylex "<trademark class='registered'>Mylex</trademark>"> +<!-- These two are no longer used in the en_US documentation, but need + leaving until translations stop using them --> <!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash, and Shockwave are trademarks or registered trademarks of Macromedia, Inc. in the United States and/or other countries.</para>"> -<!ENTITY flash "<trademark class='registered'>Flash</trademark>"> <!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>"> -<!ENTITY shockwave "<trademark class='registered'>Shockwave</trademark>"> <!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS, Outlook, Windows, Windows Media and Windows NT are either @@ -257,6 +258,8 @@ Coverity, Inc.</para>"> <!ENTITY netscape "<trademark class='registered'>Netscape</trademark>"> <!ENTITY netscape.navigator "<trademark class='registered'>Netscape Navigator</trademark>"> +<!-- These two are no longer used in the en_US documentation, but need + leaving until translations stop using them --> <!-- http://www.nexthop.com/legal.shtml --> <!ENTITY tm-attrib.nexthop "<para>GateD and NextHop are registered and unregistered trademarks of NextHop in the U.S. and other @@ -309,6 +312,8 @@ Coverity, Inc.</para>"> registered trademarks of Red Hat, Inc. in the United States and other countries.</para>"> +<!-- These four are no longer used in the en_US documentation, but need + leaving until translations stop using them --> <!ENTITY tm-attrib.sap "<para>SAP, R/3, and mySAP are trademarks or registered trademarks of SAP AG in Germany and in several other countries all over the world.</para>"> @@ -326,18 +331,16 @@ Coverity, Inc.</para>"> of Patrick Volkerding and Slackware Linux, Inc.</para>"> <!-- http://www.sparc.org/trademarksListing.html --> -<!ENTITY tm-attrib.sparc "<para>SPARC, SPARC64, SPARCengine, and +<!ENTITY tm-attrib.sparc "<para>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.</para>"> <!ENTITY sparc "<trademark class='registered'>SPARC</trademark>"> <!ENTITY sparc64 "<trademark class='registered'>SPARC64</trademark>"> -<!ENTITY sparcengine "<trademark class='registered'>SPARCengine</trademark>"> <!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>"> <!-- http://www.sun.com/suntrademarks/ --> - <!ENTITY tm-attrib.sun "<para>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.</para>"> </legalnotice> '> +<!-- This is no longer used in the en_US documentation, but needs + leaving until translations stop using it --> <!ENTITY trademarks ' <legalnotice id="trademarks" role="trademarks"> <title>Legal Notice</title>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310081728.r98HS7mQ050911>