7 files changed, 151 insertions, 93 deletions

diff --git a/en_US.ISO8859-1/articles/multi-os/article.sgml b/en_US.ISO8859-1/articles/multi-os/article.sgml
index 8ead931d08..153f212121 100644
--- a/en_US.ISO8859-1/articles/multi-os/article.sgml
+++ b/en_US.ISO8859-1/articles/multi-os/article.sgml
@@ -3,6 +3,9 @@
 <!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
 %authors;
+
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
 ]>
 
 <article>
@@ -25,10 +28,19 @@
 
     <pubdate>6 August 1996</pubdate>
 
+    <legalnotice id="trademarks" role="trademarks">
+      &tm-attrib.freebsd;
+      &tm-attrib.ibm;
+      &tm-attrib.linux;
+      &tm-attrib.microsoft;
+      &tm-attrib.powerquest;
+      &tm-attrib.general;
+    </legalnotice>
+
     <abstract>
       <para>This document discusses how to make FreeBSD coexist nicely
-	with other popular operating systems such as Linux, MS-DOS,
-	OS/2, and Windows 95.  Special thanks to: Annelise Anderson
+	with other popular operating systems such as Linux, &ms-dos;,
+	&os2;, and &windows; 95.  Special thanks to: Annelise Anderson
 	<email>andrsn@stanford.edu</email>, Randall Hopper
 	<email>rhh@ct.picker.com</email>, and &a.jkh;.</para>
     </abstract>
@@ -55,7 +67,7 @@
 	URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/">ftp</ulink>)
       useful.  It lets you repartition your hard disk without
       destroying the data already on it.  There is also a commercial
-      program available called <application>Partition&nbsp;Magic</application>, which lets you size
+      program available called <application>&partitionmagic;</application>, which lets you size
       and delete partitions without consequence.</para>
   </sect1>
 
@@ -74,18 +86,18 @@
 	<listitem>
 	  <para>This is the default boot manager used with FreeBSD.
 	    It has the ability to boot most anything, including BSD,
-	    OS/2 (HPFS), Windows 95 (FAT and FAT32), and Linux.
+	    &os2; (HPFS), &windows; 95 (FAT and FAT32), and Linux.
 	    Partitions are selected with the function keys.</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-	<term>OS/2 Boot Manager</term>
+	<term>&os2; Boot Manager</term>
 
 	<listitem>
 	  <para>This will boot FAT, FAT32, HPFS, FFS (FreeBSD), and EXT2
 	    (Linux).  Partitions
-	    are selected using arrow keys.  The OS/2 Boot Manager is
+	    are selected using arrow keys.  The &os2; Boot Manager is
 	    the only one to use its own separate partition, unlike the
 	    others which use the master boot record (MBR).  Therefore,
 	    it must be installed below the 1024th cylinder to avoid
@@ -93,7 +105,7 @@
 	    part of the boot sector, not the MBR.  Go to <ulink
 	      URL="http://www.linuxresources.com/LDP/HOWTO/HOWTO-INDEX.html">Linux
 	      HOWTOs</ulink> on the World Wide Web for more
-	    information on booting Linux with OS/2's boot
+	    information on booting Linux with the &os2; boot
 	    manager.</para>
 	</listitem>
       </varlistentry>
@@ -129,7 +141,7 @@
 
       <para>FAT32 is the replacement to the FAT filesystem included in
 	Microsoft's OEM SR2 Beta release, which started replacing FAT
-	on computers pre-loaded with Windows 95 towards the
+	on computers pre-loaded with &windows; 95 towards the
 	end of 1996.  It converts the normal FAT filesystem and
 	allows you to use smaller cluster sizes for larger hard
 	drives.  FAT32 also modifies the traditional FAT boot sector
@@ -142,7 +154,7 @@
     <title>A Typical Installation</title>
 
     <para>Let's say I have two large EIDE hard drives, and I want to
-      install FreeBSD, Linux, and Windows 95 on them.</para>
+      install FreeBSD, Linux, and &windows; 95 on them.</para>
 
     <para>Here is how I might do it using these hard disks:</para>
 
@@ -160,16 +172,16 @@
 
     <procedure>
       <step>
-	<para>I boot from a MS-DOS or Windows 95 boot disk that
+	<para>I boot from a &ms-dos; or &windows; 95 boot disk that
 	  contains the <filename>FDISK.EXE</filename> utility and make a small
-	  50&nbsp;MB primary partition (35-40 for Windows 95, plus a
+	  50&nbsp;MB primary partition (35-40 for &windows; 95, plus a
 	  little breathing room) on the first disk.  Also create a
-	  larger partition on the second hard disk for my Windows
+	  larger partition on the second hard disk for my &windows;
 	  applications and data.</para>
 	</step>
 
       <step>
-	<para>I reboot and install Windows 95 (easier said than done)
+	<para>I reboot and install &windows; 95 (easier said than done)
 	  on the <filename>C:</filename> partition.</para>
       </step>
 
@@ -197,13 +209,13 @@
 	  rest of the hard drive (about 270&nbsp;MB) for the
 	  <filename class="directory">/usr</filename> and <filename class="directory">/</filename> slices if I wish.  The
 	  rest of the second hard disk (size depends on the amount of
-	  my Windows application/data partition that I created in step
+	  my &windows; application/data partition that I created in step
 	  1) can go to the <filename class="directory">/usr/src</filename> slice and swap
 	  space.</para>
       </step>
 
       <step>
-	<para>When viewed with the Windows 95 <command>fdisk</command>
+	<para>When viewed with the &windows; 95 <command>fdisk</command>
 	  utility, my hard drives should now look something like this:
 
 	  <screen>---------------------------------------------------------------------
@@ -242,7 +254,7 @@ Press Esc to continue
 	<para>Install FreeBSD.  I make sure to boot with my first hard
 	  disk set at <quote>NORMAL</quote> in the BIOS.  If it is not,
 	  I will have the enter my true disk geometry at boot time (to
-	  get this, boot Windows 95 and consult Microsoft Diagnostics
+	  get this, boot &windows; 95 and consult Microsoft Diagnostics
 	  (<filename>MSD.EXE</filename>), or check your BIOS) with the
 	  parameter <literal>hd0=1416,16,63</literal> where
 	  <replaceable>1416</replaceable> is the number of cylinders on my hard
@@ -259,7 +271,7 @@ Press Esc to continue
 
       <step>
 	<para>When I reboot, Boot Easy should recognize my three
-	  bootable partitions as DOS (Windows 95), Linux, and BSD
+	  bootable partitions as DOS (&windows; 95), Linux, and BSD
 	  (FreeBSD).</para>
       </step>
     </procedure>
@@ -269,14 +281,14 @@ Press Esc to continue
     <title>Special Considerations</title>
 
     <para>Most operating systems are very picky about where and how
-      they are placed on the hard disk.  Windows 95 and DOS need to be
-      on the first primary partition on the first hard disk.  OS/2 is
+      they are placed on the hard disk.  &windows; 95 and DOS need to be
+      on the first primary partition on the first hard disk.  &os2; is
       the exception.  It can be installed on the first or second disk
       in a primary or extended partition.  If you are not sure, keep
       the beginning of the bootable partitions below the 1024th
       cylinder.</para>
 
-    <para>If you install Windows 95 on an existing BSD system, it will
+    <para>If you install &windows; 95 on an existing BSD system, it will
       <quote>destroy</quote> the MBR, and you will have to reinstall your
       previous boot manager.  Boot Easy can be reinstalled by using
       the <filename>BOOTINST.EXE</filename> utility included in the <filename class="directory">\TOOLS</filename> directory on the
@@ -286,16 +298,16 @@ Press Esc to continue
       partition editor.  From there, mark the FreeBSD partition as
       bootable, select Boot Manager, and then type W to (W)rite out
       the information to the MBR.  You can now reboot, and Boot Easy
-      should then recognize Windows 95 as DOS.</para>
+      should then recognize &windows; 95 as DOS.</para>
 
-    <para>Please keep in mind that OS/2 can read FAT and HPFS
+    <para>Please keep in mind that &os2; can read FAT and HPFS
       partitions, but not FFS (FreeBSD) or EXT2 (Linux) partitions.
-      Likewise, Windows 95 can only read and write to FAT and FAT32
+      Likewise, &windows; 95 can only read and write to FAT and FAT32
       (see <xref linkend="ch2">) partitions.  FreeBSD can read most
       filesystems, but currently cannot read HPFS partitions.  Linux
       can read HPFS partitions, but can not write to them.  Recent
-      versions of the Linux kernel (2.x) can read and write to Windows
-      95 VFAT partitions (VFAT is what gives Windows 95 long file
+      versions of the Linux kernel (2.x) can read and write to &windows;
+      95 VFAT partitions (VFAT is what gives &windows; 95 long file
       names - it is pretty much the same as FAT).  Linux can read and
       write to most filesystems.  Got that?  I hope so.</para>
   </sect1>
@@ -306,14 +318,14 @@ Press Esc to continue
     <para><emphasis>(section needs work, please send your example to
 	<email>jayrich@sysc.com</email>)</emphasis>.</para>
 
-    <para>FreeBSD+Win95:  If you installed FreeBSD after Windows 95,
+    <para>FreeBSD + &windows; 95:  If you installed FreeBSD after &windows; 95,
       you should see <literal>DOS</literal> on the Boot Easy menu.  This is
-      Windows 95.  If you installed Windows 95 after FreeBSD, read
+      &windows; 95.  If you installed &windows; 95 after FreeBSD, read
       <xref linkend="ch4"> above.  As long as your hard disk does not
       have 1024 cylinders you should not have a problem booting.  If
       one of your partitions goes beyond the 1024th cylinder however,
       and you get messages like <errorname>invalid system disk</errorname>
-      under DOS (Windows 95) and FreeBSD will not boot, try looking
+      under DOS (&windows; 95) and FreeBSD will not boot, try looking
       for a setting in your BIOS called <quote>&gt; 1024 cylinder
 	support</quote> or <quote>NORMAL/LBA</quote> mode.  DOS may need LBA
       (Logical Block Addressing) in order to boot correctly.  If the
@@ -322,14 +334,14 @@ Press Esc to continue
       <filename>FBSDBOOT.EXE</filename> utility on the CD (It should find your
       FreeBSD partition and boot it.)</para>
 
-    <para>FreeBSD+OS/2+Win95:  Nothing new here.  OS/2's boot manager
+    <para>FreeBSD + &os2; + &windows; 95:  Nothing new here.  The &os2; boot manager
       can boot all of these operating systems, so that should not be a
       problem.</para>
 
-    <para>FreeBSD+Linux: You can also use Boot Easy to boot both
+    <para>FreeBSD + Linux: You can also use Boot Easy to boot both
       operating systems.</para>
 
-    <para>FreeBSD+Linux+Win95:  (see <xref linkend="ch3">)</para>
+    <para>FreeBSD + Linux + &windows; 95:  (see <xref linkend="ch3">)</para>
   </sect1>
 
   <sect1 id="sources">
@@ -342,7 +354,7 @@ Press Esc to continue
 
     <para>The <ulink
 	URL="http://www.linuxresources.com/LDP/HOWTO/mini/Linux+DOS+Win95+OS2.html">Linux+DOS+Win95+OS2
-	mini-HOWTO</ulink> offers help on configuring the OS/2 boot
+	mini-HOWTO</ulink> offers help on configuring the &os2; boot
       manager, and the <ulink
 	URL="http://www.linuxresources.com/LDP/HOWTO/mini/Linux+FreeBSD.html">Linux+FreeBSD
 	mini-HOWTO</ulink> might be interesting as well.  The <ulink
@@ -350,9 +362,9 @@ Press Esc to continue
       is also helpful.</para>
 
     <para>The <ulink
-	URL="http://www.tburke.net/info/ntldr/ntldr_hacking_guide.htm">NT
+	URL="http://www.tburke.net/info/ntldr/ntldr_hacking_guide.htm">&windowsnt;
 	Loader Hacking Guide</ulink> provides good information on
-      multibooting Windows NT, '95, and DOS with other operating
+      multibooting &windowsnt;, &windows; 95, and DOS with other operating
       systems.</para>
 
     <para>And Hale Landis's <quote>How It Works</quote> document pack contains some
@@ -497,7 +509,7 @@ Press Esc to continue
 
 	    <row>
 	      <entry>0A</entry>
-	      <entry>OS/2</entry>
+	      <entry>&os2;</entry>
 	    </row>
 
 	    <row>
@@ -713,7 +725,7 @@ Press Esc to continue
 	  </listitem>
 
 	  <listitem>
-	    <para>OS/2's boot manager</para>
+	    <para>The &os2; boot manager</para>
 	  </listitem>
 	</itemizedlist>
       </sect3>
diff --git a/en_US.ISO8859-1/articles/new-users/article.sgml b/en_US.ISO8859-1/articles/new-users/article.sgml
index 5438d8d551..35529d9d68 100644
--- a/en_US.ISO8859-1/articles/new-users/article.sgml
+++ b/en_US.ISO8859-1/articles/new-users/article.sgml
@@ -8,6 +8,8 @@
 %mailing-lists;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
 %freebsd;
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
 ]>
 
 <article>
@@ -28,14 +30,23 @@
 
     <pubdate>August 15, 1997</pubdate>
 
+    <legalnotice id="trademarks" role="trademarks">
+      &tm-attrib.freebsd;
+      &tm-attrib.ibm;
+      &tm-attrib.microsoft;
+      &tm-attrib.netscape;
+      &tm-attrib.opengroup;
+      &tm-attrib.general;
+    </legalnotice>
+
     <abstract>
       <para>Congratulations on installing FreeBSD! This introduction
 	is for people new to both FreeBSD <emphasis>and</emphasis>
-	Un*x&mdash;so it starts with basics.  It assumes you are using
+	&unix;&mdash;so it starts with basics.  It assumes you are using
 	version 2.0.5 or later of FreeBSD as distributed by BSDi
 	or FreeBSD.org, your system (for now) has a single user
-	(you)&mdash;and you are probably pretty good with DOS/Windows
-	or OS/2.</para>
+	(you)&mdash;and you are probably pretty good with DOS/&windows;
+	or &os2;.</para>
     </abstract>
   </articleinfo>
 
@@ -298,7 +309,7 @@
 
 	<listitem>
 	  <para>The manual page for <replaceable>text</replaceable>.  The
-	    major source of documentation for Un*x systems.
+	    major source of documentation for &unix; systems.
 	    <command>man <parameter>ls</parameter></command> will tell
 	    you all the ways to use the <command>ls</command> command.
 	    Press <keycap>Enter</keycap> to move through text,
@@ -397,11 +408,11 @@
       <filename>/var/log/messages</filename>.</para>
 
     <para>Running such commands is part of system
-      administration&mdash;and as a single user of a Unix system,
+      administration&mdash;and as a single user of a &unix; system,
       you are your own system administrator.  Virtually everything you
       need to be root to do is system administration.  Such
       responsibilities are not covered very well even in those big fat
-      books on Unix, which seem to devote a lot of space to pulling
+      books on &unix;, which seem to devote a lot of space to pulling
       down menus in windows managers.  You might want to get one of
       the two leading books on systems administration, either Evi
       Nemeth et.al.'s <citetitle>UNIX System Administration
@@ -671,7 +682,7 @@
     </informalexample>
 
     <para>and reboot to go to DOS.  Copy these files to a DOS
-      directory, call them up with DOS EDIT, Windows Notepad or
+      directory, call them up with DOS EDIT, &windows; Notepad or
       Wordpad, or a word processor, make a minor change so the file
       has to be saved, and print as you normally would from DOS or
       Windows.  Hope it works!  manual pages come out best if printed
@@ -759,7 +770,7 @@
 	<term><command>man hier</command></term>
 
 	<listitem>
-	  <para>manual page on the Unix filesystem</para>
+	  <para>manual page on the &unix; filesystem</para>
 	</listitem>
       </varlistentry>
     </variablelist>
@@ -780,10 +791,10 @@
       file(s) on all mounted filesystems, including the CDROM and the
       DOS partition.</para>
 
-    <para>An excellent book that explains Unix commands and utilities
+    <para>An excellent book that explains &unix; commands and utilities
       is Abrahams &amp; Larson, <citetitle>Unix for the
 	Impatient</citetitle> (2nd ed., Addison-Wesley, 1996).
-      There is also a lot of Unix information on the Internet.  Try the
+      There is also a lot of &unix; information on the Internet.  Try the
       <ulink URL="http://www.geek-girl.com/unix.html">Unix Reference
 	Desk</ulink>.</para>
   </sect1>
@@ -877,16 +888,16 @@
       messages when you use <command>whereis</command> or which, you
       might want to make additions to the list of directories in the
       path statement in <filename>.cshrc</filename> in your home
-      directory.  The path statement in Unix does the same kind of
+      directory.  The path statement in &unix; does the same kind of
       work it does in DOS, except the current directory is not (by
       default) in the path for security reasons; if the command you
       want is in the directory you are in, you need to type
       <filename>./</filename> before the command to make it work; no
       space after the slash.)</para>
 
-    <para>You might want to get the most recent version of Netscape
+    <para>You might want to get the most recent version of &netscape;
       from their <ulink URL="ftp://ftp.netscape.com/">FTP site</ulink>.
-      (Netscape requires the X Window System.) There is now a FreeBSD
+      (&netscape; requires the X Window System.) There is now a FreeBSD
       version, so look around carefully.  Just use <command>gunzip
       <replaceable>filename</replaceable></command> and <command>tar
       xvf <replaceable>filename</replaceable></command> on it, move
@@ -907,7 +918,7 @@ setenv XNLSPATH /usr/X11R6/lib/X11/nls</programlisting>
       <filename>/usr/X11R6/lib/X11</filename>; if they are not, find
       them and put them there.</para>
 
-    <para>If you originally got Netscape as a port using the CDROM (or
+    <para>If you originally got &netscape; as a port using the CDROM (or
       FTP), do not replace <filename>/usr/local/bin/netscape</filename>
       with the new netscape binary; this is just a shell script that
       sets up the environment variables for you.  Instead rename the
@@ -973,7 +984,7 @@ setenv XNLSPATH /usr/X11R6/lib/X11/nls</programlisting>
     <note>
       <para>It can be dangerous to change root's shell to something
 	other than <command>sh</command> or <command>csh</command> on
-	early versions of FreeBSD and many other versions of Unix; you
+	early versions of FreeBSD and many other versions of &unix;; you
 	may not have a working shell when the system puts you into
 	single user mode.  The solution is to use <command>su
 	-m</command> to become root, which will give you the
diff --git a/en_US.ISO8859-1/articles/pam/article.sgml b/en_US.ISO8859-1/articles/pam/article.sgml
index 6a63a7286d..9f81155977 100644
--- a/en_US.ISO8859-1/articles/pam/article.sgml
+++ b/en_US.ISO8859-1/articles/pam/article.sgml
@@ -1,6 +1,12 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
 %man;
+
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+%freebsd;
+
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
 ]>
 
 <!--
@@ -72,6 +78,13 @@
 	DARPA/SPAWAR contract N66001-01-C-8035 (<quote>CBOSS</quote>),
 	as part of the DARPA CHATS research program.</para>
     </legalnotice>
+
+    <legalnotice id="trademarks" role="trademarks">
+      &tm-attrib.freebsd;
+      &tm-attrib.opengroup;
+      &tm-attrib.sun;
+      &tm-attrib.general;
+    </legalnotice>
   </articleinfo>
 
   <section id="pam-intro">
@@ -94,21 +107,7 @@
     <para>Although this article focuses primarily on FreeBSD 5.x,
       which uses OpenPAM, it should be equally applicable to FreeBSD
       4.x, which uses Linux-PAM, and other operating systems such as
-      Linux and Solaris.</para>
-
-    <section id="pam-trademarks">
-      <title id="pam-trademarks.title">Trademarks</title>
-
-      <para>Sun, Sun Microsystems, SunOS and Solaris are trademarks or
-	registered trademarks of Sun Microsystems, Inc.</para>
-
-      <para>UNIX and The Open Group are trademarks or registered
-	trademarks of The Open Group.</para>
-
-      <para>All other brand or product names mentioned in this
-	document may be trademarks or registered trademarks of their
-	respective owners.</para>
-    </section>
+      Linux and &solaris;.</para>
   </section>
 
   <section id="pam-terms">
@@ -511,7 +510,7 @@ sshd	password	required	pam_permit.so</programlisting>
 	module is a self-contained piece of program code that
 	implements the primitives in one or more facilities for one
 	particular mechanism; possible mechanisms for the
-	authentication facility, for instance, include the UNIX
+	authentication facility, for instance, include the &unix;
 	password database, NIS, LDAP and Radius.</para>
 
       <section id="pam-module-naming">
@@ -520,11 +519,11 @@ sshd	password	required	pam_permit.so</programlisting>
 	<para>FreeBSD implements each mechanism in a single module,
 	  named
 	  <literal>pam_<replaceable>mechanism</replaceable>.so</literal>
-	  (for instance, <literal>pam_unix.so</literal> for the Unix
+	  (for instance, <literal>pam_unix.so</literal> for the &unix;
 	  mechanism.)  Other implementations sometimes have separate
 	  modules for separate facilities, and include the facility
 	  name as well as the mechanism name in the module name.  To
-	  name one example, Solaris has a
+	  name one example, &solaris; has a
 	  <literal>pam_dial_auth.so.1</literal> module which is
 	  commonly used to authenticate dialup users.</para>
       </section>
@@ -547,7 +546,7 @@ sshd	password	required	pam_permit.so</programlisting>
 	  applications to take advantage of the most recent
 	  modules.</para>
 
-	<para>Although Solaris PAM modules commonly have a version
+	<para>Although &solaris; PAM modules commonly have a version
 	  number, they're not truly versioned, because the number is a
 	  part of the module name and must be included in the
 	  configuration.</para>
@@ -588,8 +587,8 @@ sshd	password	required	pam_permit.so</programlisting>
 	      rest of the chain is executed, but the request is
 	      ultimately denied.</para>
 
-	    <para>This control flag was introduced by Sun in Solaris 9
-	      (SunOS 5.9), and is also supported by OpenPAM.</para>
+	    <para>This control flag was introduced by Sun in &solaris; 9
+	      (&sunos; 5.9), and is also supported by OpenPAM.</para>
 	  </listitem>
 	</varlistentry>
 
@@ -774,7 +773,7 @@ sshd	password	required	pam_permit.so</programlisting>
 	not&mdash;except that entries for the <literal>other</literal>
 	service, which serves as a fall-back, should come last.  The
 	examples in the original PAM paper grouped configuration lines
-	by facility, and Solaris' stock <filename>pam.conf</filename>
+	by facility, and the &solaris; stock <filename>pam.conf</filename>
 	still does that, but FreeBSD's stock configuration groups
 	configuration lines by service.  Either way is fine; either
 	way makes equal sense.</para>
@@ -857,7 +856,7 @@ sshd	password	required	pam_permit.so</programlisting>
 	the action to associate with each possible return code, but
 	this should be avoided as it is non-standard and closely tied
 	in with the way Linux-PAM dispatches service calls (which
-	differs greatly from the way Solaris and OpenPAM do it.)
+	differs greatly from the way &solaris; and OpenPAM do it.)
 	Unsurprisingly, OpenPAM does not support this syntax.</para>
     </section>
 
@@ -1152,7 +1151,7 @@ sshd	password	required	pam_permit.so</programlisting>
     <section id="pam-modules-unix">
       <title id="pam-modules-unix.title">&man.pam.unix.8;</title>
 
-      <para>The &man.pam.unix.8; module implements traditional Unix
+      <para>The &man.pam.unix.8; module implements traditional &unix;
 	password authentication, using &man.getpwnam.3; to obtain the
 	target account's password and compare it with the one provided
 	by the applicant.  It also provides account management
diff --git a/en_US.ISO8859-1/articles/pxe/article.sgml b/en_US.ISO8859-1/articles/pxe/article.sgml
index 4f4505e438..0daddba58e 100644
--- a/en_US.ISO8859-1/articles/pxe/article.sgml
+++ b/en_US.ISO8859-1/articles/pxe/article.sgml
@@ -7,6 +7,9 @@
 
 <!ENTITY % misc PUBLIC	"-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
 %misc;
+
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
 ]>
 
 <article>
@@ -26,9 +29,15 @@
 
     <pubdate>$FreeBSD$</pubdate>
 
+    <legalnotice id="trademarks" role="trademarks">
+      &tm-attrib.freebsd;
+      &tm-attrib.intel;
+      &tm-attrib.general;
+    </legalnotice>
+
     <abstract>
       <para>This article details the method used to allow machines to install
-        FreeBSD using the Intel PXE method of booting a machine over a network.
+        FreeBSD using the &intel; PXE method of booting a machine over a network.
         </para>
     </abstract>
   </articleinfo>
@@ -62,7 +71,7 @@
     </informaltable>
 
     <para>Requires:
-      Clients supporting the Intel PXE netboot option, an Ethernet connection.
+      Clients supporting the &intel; PXE netboot option, an Ethernet connection.
       </para>
 
     <para>Please let me know if you come across anything you have problems with
@@ -72,7 +81,7 @@
       for you, please send email so that we can discuss terms.</para>
 
     <para>I would also like to thank &a.ps; and &a.jhb; for doing most of the
-      programming work on pxeboot, the interface to Intel's PXE (netboot)
+      programming work on pxeboot, the interface to the &intel; PXE (netboot)
       system.</para>
   </sect1>
 
diff --git a/en_US.ISO8859-1/articles/releng-packages/article.sgml b/en_US.ISO8859-1/articles/releng-packages/article.sgml
index 8ec0804d77..e57e8fe953 100644
--- a/en_US.ISO8859-1/articles/releng-packages/article.sgml
+++ b/en_US.ISO8859-1/articles/releng-packages/article.sgml
@@ -11,6 +11,8 @@
 %freebsd;
 <!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
 %authors;
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
 ]>
 
 <article>
@@ -29,6 +31,13 @@
 
     <pubdate>$FreeBSD$</pubdate>
 
+    <legalnotice id="trademarks" role="trademarks">
+      &tm-attrib.freebsd;
+      &tm-attrib.intel;
+      &tm-attrib.xfree86;
+      &tm-attrib.general;
+    </legalnotice>
+
     <abstract>
       <para>This paper describes the approach used by the FreeBSD
         release engineering team to produce a high quality package set
@@ -81,8 +90,8 @@
         installed.</para>
 
       <para>The <quote>Ports Cluster</quote> for the x86 architecture
-        currently consists of a master node (Dual Pentium III 733MHz)
-        and 8 slave nodes (Pentium III 800MHz) to do the actual
+        currently consists of a master node (Dual &pentium; III 733MHz)
+        and 8 slave nodes (&pentium; III 800MHz) to do the actual
         package builds.  With this configuration, a complete package
         build takes over 24 hours.  These machines are co-located with
         the other FreeBSD Project equipment at Yahoo's corner of
@@ -178,7 +187,7 @@
 
 	<listitem><para>This script removes lines from an
 	  <filename>INDEX</filename> file for packages that are not present.
-	  It also removes the XFree86 dependencies.  NOTE: you will need to
+	  It also removes the &xfree86; dependencies.  NOTE: you will need to
 	  tweak the value of the <varname>xdep</varname> variable to make sure
 	  the version number is correct.</para></listitem>
       </varlistentry>
@@ -221,7 +230,7 @@
         <filename>print-cdrom-packages.sh</filename> and that it is
         from the correct release.</para></listitem>
 
-      <listitem><para>Check to make sure the XFree86 dependency in
+      <listitem><para>Check to make sure the &xfree86; dependency in
         <filename>scrubindex.pl</filename> has the correct
         version number.  You will also need to make sure this value is
         correct in <filename>doit.sh</filename> as
diff --git a/en_US.ISO8859-1/articles/releng/article.sgml b/en_US.ISO8859-1/articles/releng/article.sgml
index ed51f7b78c..c96abec313 100644
--- a/en_US.ISO8859-1/articles/releng/article.sgml
+++ b/en_US.ISO8859-1/articles/releng/article.sgml
@@ -14,6 +14,8 @@
 %man;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
 %freebsd;
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
 <!ENTITY art.re.pkgs '<ulink url="../releng-packages/article.html">The Release Engineering of Third Party Packages</ulink>'>
 ]>
 
@@ -47,6 +49,14 @@
     </authorgroup>
 
     <pubdate>$FreeBSD$</pubdate>
+
+    <legalnotice id="trademarks" role="trademarks">
+      &tm-attrib.freebsd;
+      &tm-attrib.intel;
+      &tm-attrib.xfree86;
+      &tm-attrib.general;
+    </legalnotice>
+
     <abstract>
       <para>This paper describes the approach used by the FreeBSD
         release engineering team to make production quality releases
@@ -600,14 +610,14 @@
   </sect2>
   
   <sect2>
-    <title>Building <application>XFree86</application></title>
+    <title>Building <application>&xfree86;</application></title>
 
-    <para><application>XFree86</application> is an important component for many desktop users.
-      Prior to FreeBSD 4.6-RELEASE, releases used XFree86
+    <para><application>&xfree86;</application> is an important component for many desktop users.
+      Prior to FreeBSD 4.6-RELEASE, releases used &xfree86;
       3.<replaceable>X</replaceable> by default.
       The easiest way to build these versions is to use the
       <filename>src/release/scripts/X11/build_x.sh</filename> script.
-      This script requires that XFree86 and Tcl/Tk already be
+      This script requires that &xfree86; and Tcl/Tk already be
       installed on the build host.  After compiling the necessary X
       servers, the script will package all of the files into tarballs
       that &man.sysinstall.8; expects to find in the
@@ -615,7 +625,7 @@
       media.</para>
 
     <para>Beginning with FreeBSD 4.6-RELEASE, &man.sysinstall.8;
-      installs XFree86 4.<replaceable>X</replaceable> by default, as a
+      installs &xfree86; 4.<replaceable>X</replaceable> by default, as a
       set of <quote>normal</quote> packages.  These can either be the
       packages generated by the package-building cluster or packages
       built from an appropriately tagged ports tree.</para>
@@ -673,14 +683,14 @@
         release</command>. The only changes
         that should be made to the <filename>disc1</filename> directory are the addition of
         a <filename>tools</filename> directory, <application
-        class="software">XFree86</application>, and as many popular
+        class="software">&xfree86;</application>, and as many popular
         third party software packages as will fit on the disc. The
         <filename>tools</filename> directory contains software that allow users to create
         installation floppies from other operating systems. This disc
         should be made bootable so that users of modern PCs do not
         need to create installation floppy disks.</para>
       
-      <para>If an alternate version of XFree86 is to be provided, then
+      <para>If an alternate version of &xfree86; is to be provided, then
         &man.sysinstall.8; must be updated to reflect the new location
         and installation instructions. The relevant code is contained
         in <filename>src/release/sysinstall</filename> on -STABLE or
@@ -862,7 +872,7 @@
     <para>The FreeBSD system installation and configuration tool,
       &man.sysinstall.8;, can be scripted to provide automated installs
       for large sites. This functionality can be used in conjunction
-      with Intel's PXE[13] to bootstrap systems from the network, or
+      with &intel; PXE[13] to bootstrap systems from the network, or
       via custom boot floppies with a sysinstall script.  An example
       sysinstall script is available in the CVS tree as
       <filename>src/release/sysinstall/install.cfg</filename>.</para>
diff --git a/en_US.ISO8859-1/articles/serial-uart/article.sgml b/en_US.ISO8859-1/articles/serial-uart/article.sgml
index 2d41e5d1e9..21df56f77f 100644
--- a/en_US.ISO8859-1/articles/serial-uart/article.sgml
+++ b/en_US.ISO8859-1/articles/serial-uart/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>
@@ -22,6 +24,12 @@
     
     <pubdate>$FreeBSD$</pubdate>
     
+    <legalnotice id="trademarks" role="trademarks">
+      &tm-attrib.freebsd;
+      &tm-attrib.microsoft;
+      &tm-attrib.general;
+    </legalnotice>
+
     <abstract>
       <para>This article talks about using serial hardware with FreeBSD.</para>
     </abstract>
@@ -986,10 +994,10 @@
 	  used at all with a given operating system or driver.  These
 	  differences may show up when using other drivers, or when
 	  particular combinations of events occur that were not well
-	  tested or considered in the Windows driver.  This is because
+	  tested or considered in the &windows; driver.  This is because
 	  most modem vendors and 16550-clone makers use the Microsoft
-	  drivers from Windows for Workgroups 3.11 and the Microsoft
-	  MS-DOS utility as the primary tests for compatibility with
+	  drivers from &windows; for Workgroups 3.11 and the &microsoft;
+	  &ms-dos; utility as the primary tests for compatibility with
 	  the NS16550A.  This over-simplistic criteria means that if a
 	  different operating system is used, problems could appear
 	  due to subtle differences between the clones and genuine