diff --git a/en_US.ISO8859-1/share/sgml/catalog b/en_US.ISO8859-1/share/sgml/catalog
index e6008ea304..a3942669a7 100644
--- a/en_US.ISO8859-1/share/sgml/catalog
+++ b/en_US.ISO8859-1/share/sgml/catalog
@@ -1,17 +1,14 @@
-- ...................................................................... --
-- FreeBSD SGML Public Identifiers ...................................... --
-- $FreeBSD$
--
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
"freebsd.dsl"
PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
"mailing-lists.ent"
PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
"l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
- "trademarks.ent"
diff --git a/share/sgml/catalog b/share/sgml/catalog
index 06b020e593..a6509a67d1 100644
--- a/share/sgml/catalog
+++ b/share/sgml/catalog
@@ -1,59 +1,62 @@
-- ...................................................................... --
-- FreeBSD SGML Public Identifiers ...................................... --
-- $FreeBSD$
--
-- ...................................................................... --
-- Language neutral ..................................................... --
-- These identifiers are shared across all translations of the FreeBSD
documentation, even though the listed language is "EN"
--
PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN"
"freebsd.dtd"
PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN"
"freebsd41.dtd"
PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
"man-refs.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
"freebsd.dsl"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN"
"freebsd.dsl"
PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
"freebsd.ent"
PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
"l10n.ent"
PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN"
"l10n.ent"
+PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "trademarks.ent"
+
-- ...................................................................... --
-- English specific ..................................................... --
-- These identifiers should only be used by English language versions of
the FreeBSD Documentation.
All other translations should base their FPIs on these, but change the
final parameter in the FPI to represent the target language, as
appropriate. Do not change the rest of the FPI
--
PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//EN"
"../../en_US.ISO8859-1/share/sgml/bookinfo.ent"
PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
"../../en_US.ISO8859-1/share/sgml/authors.ent"
PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
"../../en_US.ISO8859-1/share/sgml/teams.ent"
PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
"../../en_US.ISO8859-1/share/sgml/newsgroups.ent"
diff --git a/share/sgml/trademarks.ent b/share/sgml/trademarks.ent
new file mode 100644
index 0000000000..f5cebfa5f3
--- /dev/null
+++ b/share/sgml/trademarks.ent
@@ -0,0 +1,202 @@
+
+
+3Com and HomeConnect are registered
+ trademarks of 3Com Corporation.">
+
+3Com">
+
+Adobe, Acrobat, Acrobat Reader, and
+ PostScript are either registered trademarks or trademarks of Adobe
+ Systems Incorporated in the United States and/or other
+ countries.">
+Acrobat">
+Acrobat Reader">
+PostScript">
+
+Apple, FireWire, Macintosh, Mac OS,
+ Quicktime, and TrueType are trademarks of Apple Computer, Inc.,
+ registered in the United States and other countries.">
+FireWire">
+Macintosh">
+Mac OS">
+TrueType">
+
+
+Check Point, Firewall-1, and
+ VPN-1 are trademarks of Check Point Software Technologies
+ Ltd..">
+
+Corel and WordPerfect are trademarks
+ or registered trademarks of Corel Corporation and/or its
+ subsidiaries in Canada, the United States and/or other
+ countries.">
+
+
+Sound Blaster is a trademark of
+ Creative Technology Ltd. in the United States and/or other
+ countries.">
+SoundBlaster">
+
+FreeBSD is a registered trademark of
+ Wind River Systems, Inc. This is expected to change soon.">
+
+IBM, AIX, OS/2, PowerPC, and S/390 are
+ trademarks of International Business Machines Corporation in the
+ United States, other countries, or both.">
+AIX">
+OS/2">
+PowerPC">
+S/390">
+
+IEEE, POSIX, and 802 are registered
+ trademarks of Institute of Electrical and Electronics Engineers,
+ Inc. in the United States.">
+POSIX">
+
+Intel, Celeron, EtherExpress, i386,
+ i486, Itanium, Pentium, and Xeon are trademarks or registered
+ trademarks of Intel Corporation or its subsidiaries in the United
+ States and other countries.">
+Celeron">
+EtherExpress">
+i386">
+i486">
+Intel">
+Itanium">
+Pentium">
+Xeon">
+
+
+Intuit and Quicken are registered
+ trademarks and/or registered service marks of Intuit Inc., or one of
+ its subsidiaries, in the United States and other countries.">
+
+Iomega, Zip, and Jaz are either
+ registered trademarks or trademarks of Iomega Corporation in the
+ United States and/or other countries.">
+Zip">
+Jaz">
+
+Linux is a registered trademarks of
+ Linus Torvalds in the United States.">
+
+Microsoft, FrontPage, MS-DOS,
+ Outlook, Windows, Windows Media, and Windows NT are either
+ registered trademarks or trademarks of Microsoft Corporation in the
+ United States and/or other countries.">
+Microsoft">
+MS-DOS">
+Outlook">
+Windows">
+Windows NT">
+
+
+MIPS and R4000 are registered
+ trademarks of MIPS Technologies, Inc. in the United States and other
+ countries.">
+MIPS">
+
+Netscape and the Netscape Navigator
+ are registered trademarks of Netscape Communications Corporation in
+ the U.S. and other countries.">
+Netscape">
+Netscape Navigator">
+
+
+NetWare, NetWare Loadable Module, and
+ NLM are either registered trademarks or trademarks of Novell,
+ Inc. in the United States and other countries.">
+
+Motif, OSF/1, and UNIX are
+ registered trademarks and IT DialTone and The Open Group are
+ trademarks of The Open Group in the United States and other
+ countries.">
+UNIX">
+Motif">
+
+
+
+Oracle is a registered trademark is a
+ of Oracle Corporation.">
+Oracle">
+
+
+PowerQuest and PartitionMagic are
+ registered trademarks of PowerQuest Corporation in the United States
+ and/or other countries.">
+PartitionMagic">
+
+
+RealNetworks, RealPlayer, and
+ RealAudio are the registered trademarks of RealNetworks,
+ Inc.">
+
+
+
+Red Hat, RPM, are trademarks or
+ 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.">
+
+Silicon Graphics, SGI, and OpenGL are
+ registered trademarks of Silicon Graphics, Inc., in the United
+ States and/or other countries worldwide.">
+OpenGL">
+
+Sparc, Sparc64, SPARCEngine, and
+ UltraSPARC are trademarks of SPARC International, Inc in the United
+ States and other countries. Products bearing SPARC trademarks are
+ based upon architecture developed by Sun Microsystems, Inc.">
+Sparc">
+Sparc64">
+UltraSPARC">
+
+Sun, Sun Microsystems, StarOffice,
+ SunOS, Solaris, and Java are trademarks or registered trademarks of
+ Sun Microsystems, Inc. in the United States and other
+ countries.">
+Java">
+JDK">
+StarOffice">
+Solaris">
+SunOS">
+
+
+Symantec and Ghost are registered
+ trademarks of Symantec Corporation in the United States and other
+ countries.">
+
+
+QUALCOMM and Eudora are registered
+ trademarks of QUALCOMM Incorporated.">
+Eudora">
+
+
+Waterloo Maple and Maple
+ trademarks or registered trademarks of Waterloo Maple Inc.">
+
+
+Mathematica is a registered
+ trademark of Wolfram Research, Inc.">
+
+Many of the designations used by
+ manufacturers and sellers to distinguish their products are claimed
+ as trademarks. Where those designations appear in this document,
+ and the FreeBSD Project was aware of the trademark claim, the
+ designations have been followed by the ™
or the
+ ®
symbol.">