os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

- Fix typo in a comment.

Browse source 
- Remove the text about keeping the trademark list in doc/ and the one
  in www/ synchronized.  The doc/ trademark list is too big, so it's
  better just to add the needed trademark attributions in the www/
  trademark file.
- Add a missing period in the VMware trademark attribution.
- Sort the entries in this file; somebody pass me an alphabet.
This commit is contained in:
Simon L. B. Nielsen 2003-09-21 22:23:02 +00:00
parent 2b76de551b
commit a8c3a5a880
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=18208
1 changed files with 27 additions and 28 deletions

55
share/sgml/trademarks.ent
View file

@ -3,11 +3,10 @@
This file contains entities with trademark attributions for all
the companies the FreeBSD documentation references. It also
contains entities for common products whith proper trademark
contains entities for common products with proper trademark
symbols.
Please keep this file sorted and in sync with
www/en/copyright/trademarks.sgml.
Please keep this file sorted.
$FreeBSD$
-->
@ -22,31 +21,31 @@
<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
<!ENTITY escalade "<trademark class='registered'>Escalade</trademark>">
<!ENTITY tm-attrib.adobe "<para>Adobe, Acrobat, Acrobat Reader, and
PostScript are either registered trademarks or trademarks of Adobe
Systems Incorporated in the United States and/or other
countries.</para>">
<!ENTITY adobe "<trademark class='registered'>Adobe</trademark>">
<!ENTITY acrobat "<trademark class='registered'>Acrobat</trademark>">
<!ENTITY acrobat.reader "<trademark class='registered'>Acrobat&nbsp;Reader</trademark>">
<!ENTITY postscript "<trademark class='registered'>PostScript</trademark>">
<!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
<!ENTITY tm-attrib.adaptec "<para>Adaptec is a registered trademark of
Adaptec, Inc.</para>">
<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>">
<!ENTITY tm-attrib.adobe "<para>Adobe, Acrobat, Acrobat Reader, 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&nbsp;Reader</trademark>">
<!ENTITY adobe "<trademark class='registered'>Adobe</trademark>">
<!ENTITY postscript "<trademark class='registered'>PostScript</trademark>">
<!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
<!ENTITY tm-attrib.amd "<para>AMD, Am486, Am5X86, AMD Athlon, AMD
Duron, AMD Opteron AMD, AMD-K6, &Eacute;lan, and PCnet are
trademarks of Advanced Micro Devices, Inc.</para>">
<!ENTITY am486 "<trademark class='registered'>Am486</trademark>">
<!ENTITY am5x86 "<trademark class='registered'>Am5x86</trademark>">
<!ENTITY elan "<trademark>&Eacute;lan</trademark>">
<!ENTITY amd.k6 "<trademark class='registered'>AMD-K6</trademark>">
<!ENTITY amd.athlon "<trademark>AMD&nbsp;Athlon</trademark>">
<!ENTITY amd.duron "<trademark>AMD&nbsp;Duron</trademark>">
<!ENTITY amd.k6 "<trademark class='registered'>AMD-K6</trademark>">
<!ENTITY amd.opteron "<trademark>AMD&nbsp;Operon</trademark>">
<!ENTITY elan "<trademark>&Eacute;lan</trademark>">
<!ENTITY tm-attrib.apple "<para>Apple, FireWire, Mac, Macintosh, Mac OS,
Quicktime, and TrueType are trademarks of Apple Computer, Inc.,
@ -55,8 +54,8 @@
<!ENTITY mac "<trademark class='registered'>Mac</trademark>">
<!ENTITY macintosh "<trademark class='registered'>Macintosh</trademark>">
<!ENTITY macos "<trademark class='registered'>Mac&nbsp;OS</trademark>">
<!ENTITY truetype "<trademark class='registered'>TrueType</trademark>">
<!ENTITY quicktime "<trademark class='registered'>Quicktime</trademark>">
<!ENTITY truetype "<trademark class='registered'>TrueType</trademark>">
<!ENTITY tm-attrib.arm "<para>ARM is a registered trademark of ARM
Limited.</para>">
@ -167,12 +166,12 @@
registered trademarks or trademarks of Microsoft Corporation in the
United States and/or other countries.</para>">
<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>">
<!ENTITY microsoft.windows "&microsoft;&nbsp;&windows;">
<!ENTITY ms-dos "<trademark class='registered'>MS-DOS</trademark>">
<!ENTITY outlook "<trademark class='registered'>Outlook</trademark>">
<!ENTITY windows "<trademark class='registered'>Windows</trademark>">
<!ENTITY windows.media "<trademark class='registered'>Windows Media</trademark>">
<!ENTITY windowsnt "<trademark class='registered'>Windows&nbsp;NT</trademark>">
<!ENTITY microsoft.windows "&microsoft;&nbsp;&windows;">
<!ENTITY tm-attrib.mips "<para>MIPS and R4000 are registered
trademarks of MIPS Technologies, Inc. in the United States and other
@ -200,8 +199,8 @@
registered trademarks and IT DialTone and The Open Group are
trademarks of The Open Group in the United States and other
countries.</para>">
<!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
<!ENTITY motif "<trademark class='registered'>Motif</trademark>">
<!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
<!-- http://www.oracle.com/html/trademark.html -->
<!-- http://www.oracle.com/html/3party.html -->
@ -215,6 +214,11 @@
and/or other countries.</para>">
<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>">
<!-- http://www.qualcomm.com/main/legal.html -->
<!ENTITY tm-attrib.qualcomm "<para>QUALCOMM and Eudora are registered
trademarks of QUALCOMM Incorporated.</para>">
<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>">
<!-- http://www.realnetworks.com/company/logos/policy.html -->
<!ENTITY tm-attrib.realnetworks "<para>RealNetworks, RealPlayer, and
RealAudio are the registered trademarks of RealNetworks,
@ -244,8 +248,8 @@
based upon architecture developed by Sun Microsystems, Inc.</para>">
<!ENTITY sparc "<trademark class='registered'>Sparc</trademark>">
<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>">
<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
<!ENTITY sparcengine "<trademark class='registered'>SPARCEngine</trademark>">
<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
<!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java, Java Virtual Machine, JavaServer Pages, JDK, JSP, JVM, Netra, Solaris, StarOffice,
Sun Blade, Sun Enterprise, Sun Fire, SunOS, and Ultra are trademarks or registered trademarks of
@ -258,8 +262,8 @@
<!ENTITY jsp "<trademark>JSP</trademark>">
<!ENTITY jvm "<trademark>JVM</trademark>">
<!ENTITY netra "<trademark>Netra</trademark>">
<!ENTITY staroffice "<trademark>StarOffice</trademark>">
<!ENTITY solaris "<trademark>Solaris</trademark>">
<!ENTITY staroffice "<trademark>StarOffice</trademark>">
<!ENTITY sun.blade "<trademark>Sun&nbsp;Blade</trademark>">
<!ENTITY sun.enterprise "<trademark>Sun&nbsp;Enterprise</trademark>">
<!ENTITY sun.fire "<trademark>Sun&nbsp;Fire</trademark>">
@ -294,15 +298,6 @@
<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>">
<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>">
<!-- http://www.vmware.com/legal.html -->
<!ENTITY tm-attrib.vmware "<para>VMware is a trademark of VMware,
Inc</para>">
<!-- http://www.qualcomm.com/main/legal.html -->
<!ENTITY tm-attrib.qualcomm "<para>QUALCOMM and Eudora are registered
trademarks of QUALCOMM Incorporated.</para>">
<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>">
<!-- http://www.maplesoft.com/trademarks.shtml -->
<!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple and Maple are
trademarks or registered trademarks of Waterloo Maple Inc.</para>">
@ -313,6 +308,10 @@
trademark of Wolfram Research, Inc.</para>">
<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>">
<!-- http://www.vmware.com/legal.html -->
<!ENTITY tm-attrib.vmware "<para>VMware is a trademark of VMware,
Inc.</para>">
<!ENTITY tm-attrib.xfree86 "<para>XFree86 is a trademark of The
XFree86 Project, Inc.</para>">
<!ENTITY xfree86 "<trademark>XFree86</trademark>">