diff --git a/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml b/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml
index 11443bf34d..abc02890fc 100644
--- a/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml
+++ b/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml
@@ -3,6 +3,8 @@
%man;
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
%authors;
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
]>
<article>
@@ -26,6 +28,11 @@
<releaseinfo>$FreeBSD$</releaseinfo>
+ <legalnotice id="trademarks" role="trademarks">
+ &tm-attrib.freebsd;
+ &tm-attrib.general;
+ </legalnotice>
+
<abstract>
<para>This article describes the steps I took to setup a CVS repository
that uses the same scripts the FreeBSD project uses in their setup.
diff --git a/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml b/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml
index 9c21e49762..9575640d77 100644
--- a/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml
+++ b/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml
@@ -5,6 +5,9 @@
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
%man;
+
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
]>
<article>
@@ -24,6 +27,11 @@
<pubdate>$FreeBSD$</pubdate>
+ <legalnotice id="trademarks" role="trademarks">
+ &tm-attrib.freebsd;
+ &tm-attrib.general;
+ </legalnotice>
+
<abstract>
<para>The present article assumes a basic understanding of <application>CVSup</application>
operation. It documents several delicate issues connected with
diff --git a/en_US.ISO8859-1/articles/dialup-firewall/article.sgml b/en_US.ISO8859-1/articles/dialup-firewall/article.sgml
index 8ae2026104..1bc1775ce6 100644
--- a/en_US.ISO8859-1/articles/dialup-firewall/article.sgml
+++ b/en_US.ISO8859-1/articles/dialup-firewall/article.sgml
@@ -5,6 +5,9 @@
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
%man;
+
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
]>
<article>
@@ -24,6 +27,11 @@
<pubdate>$FreeBSD$</pubdate>
+ <legalnotice id="trademarks" role="trademarks">
+ &tm-attrib.freebsd;
+ &tm-attrib.general;
+ </legalnotice>
+
<abstract>
<para>This article documents how to setup a firewall using a PPP
dialup with FreeBSD and IPFW, and specifically with firewalling over
diff --git a/en_US.ISO8859-1/articles/diskless-x/article.sgml b/en_US.ISO8859-1/articles/diskless-x/article.sgml
index b76978749e..7a58b55a55 100644
--- a/en_US.ISO8859-1/articles/diskless-x/article.sgml
+++ b/en_US.ISO8859-1/articles/diskless-x/article.sgml
@@ -8,6 +8,9 @@
<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
%man;
+
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
]>
<article>
@@ -32,6 +35,14 @@
<holder>Jerry Kendall</holder>
</copyright>
+ <legalnotice id="trademarks" role="trademarks">
+ &tm-attrib.freebsd;
+ &tm-attrib.3com;
+ &tm-attrib.microsoft;
+ &tm-attrib.sun;
+ &tm-attrib.general;
+ </legalnotice>
+
<abstract>
<para>With the help of some friends on the FreeBSD-hackers list, I have
been able to create a diskless X terminal. The creation of the X
@@ -44,7 +55,7 @@
role="fqdn">antares.example.com</hostid> across a Ethernet. The second
system is a 486DX2-66. I setup a diskless FreeBSD (complete) that
uses no local disk. The server in that case is a Sun 670MP running
- SunOS 4.1.3. The same setup configuration was needed for both.</para>
+ &sunos; 4.1.3. The same setup configuration was needed for both.</para>
<para>I am sure that there is stuff that needs to be added
to this. Please send me any comments.</para>
@@ -55,7 +66,7 @@
<title>Creating the boot floppy (On the diskless system)</title>
<para>Since the network boot loaders will not work with some of the TSR's
- and such that MS-DOS uses, it is best to create a dedicated boot floppy
+ and such that &ms-dos; uses, it is best to create a dedicated boot floppy
or, if you can, create an MS-DOS menu that will (via the
<filename>config.sys</filename>/<filename>autoexec.bat</filename> files)
ask what configuration to load when the system starts. The later is the
@@ -114,7 +125,7 @@ nb8390.com
<para>If you know the chipset that your Ethernet adapter uses, this is
easy. If you have the NS8390 chipset, or a NS8390 based chipset, use
- <filename>nb8390.com</filename>. If you have a 3Com 509 based chipset,
+ <filename>nb8390.com</filename>. If you have a &t3com; 509 based chipset,
use the <filename>nb3C509.com</filename> boot program. If you are not
sure which you have, try using one, if it says <errorname>No adapter
found</errorname>, try the other. Beyond that, you are pretty much on
diff --git a/en_US.ISO8859-1/articles/euro/article.sgml b/en_US.ISO8859-1/articles/euro/article.sgml
index 683793499a..f0906e4801 100644
--- a/en_US.ISO8859-1/articles/euro/article.sgml
+++ b/en_US.ISO8859-1/articles/euro/article.sgml
@@ -1,6 +1,9 @@
<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
%man;
+
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
]>
<article>
@@ -30,6 +33,11 @@
<pubdate role="rcs">$FreeBSD$</pubdate>
+ <legalnotice id="trademarks" role="trademarks">
+ &tm-attrib.freebsd;
+ &tm-attrib.general;
+ </legalnotice>
+
<abstract>
<para>This document will try to help you in getting started with the new
<keycap>Euro</keycap> Symbol on your new keyboard that you had to buy