diff options
| author | Marc Fonvieille <blackend@FreeBSD.org> | 2007-04-09 09:13:35 +0000 |
|---|---|---|
| committer | Marc Fonvieille <blackend@FreeBSD.org> | 2007-04-09 09:13:35 +0000 |
| commit | bf0d1ed0d0b31af991351791cc5e61f3f133f1f7 (patch) | |
| tree | a2b95aee6ceda308a3e5fcc0b9ad9a33390a0615 | |
| parent | ccbf8e5437415a7a3f3de253ac429576e0175db2 (diff) | |
Notes
| -rw-r--r-- | share/sgml/trademarks.ent | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/share/sgml/trademarks.ent b/share/sgml/trademarks.ent index 4a168e35b5..10e77575b6 100644 --- a/share/sgml/trademarks.ent +++ b/share/sgml/trademarks.ent @@ -56,6 +56,7 @@ <!ENTITY airport "<trademark class='registered'>AirPort</trademark>"> <!ENTITY apple "<trademark class='registered'>Apple</trademark>"> <!ENTITY firewire "<trademark class='registered'>FireWire</trademark>"> +<!ENTITY imac "<trademark class='registered'>iMac</trademark>"> <!ENTITY mac "<trademark class='registered'>Mac</trademark>"> <!ENTITY macintosh "<trademark class='registered'>Macintosh</trademark>"> <!ENTITY macos "<trademark class='registered'>Mac OS</trademark>"> @@ -295,6 +296,10 @@ States and/or other countries worldwide.</para>"> <!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>"> +<!-- http://slackware.com/trademark/trademark.php --> +<!ENTITY tm-attrib.slackware "<para>Slackware is a registered trademark + of Patrick Volkerding and Slackware Linux, Inc.</para>"> + <!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, SPARCEngine, and UltraSPARC are trademarks of SPARC International, Inc in the United States and other countries. Products bearing SPARC trademarks are |