- Use trademark entities.

- Add trademark attributions.

en_US.ISO8859-1/articles/solid-state/article.sgml

@@ -34,6 +34,9 @@
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
 %man;
 <!ENTITY legalnotice SYSTEM "../../share/sgml/legalnotice.sgml">
+
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
 ]>
 
 <article>
@@ -58,6 +61,12 @@
       <holder>The FreeBSD Documentation Project</holder>
     </copyright>
 
+    <legalnotice id="trademarks" role="trademarks">
+      &tm-attrib.freebsd;
+      &tm-attrib.m-systems;
+      &tm-attrib.general;
+    </legalnotice>
+
     &legalnotice;
     
     <abstract>
@@ -103,18 +112,18 @@
       temperature of the environment.</para>
 
     <para>Specifically, we will be discussing ATA compatible compact-flash
-      units and the M-Systems Disk-On-Chip flash memory unit.  ATA compatible
+      units and the M-Systems &diskonchip; flash memory unit.  ATA compatible
       compact-flash cards are quite popular as storage media for digital
       cameras.  Of particular interest is the fact that they pin out directly
       to the IDE bus and are compatible with the ATA command set.  Therefore,
       with a very simple and low-cost adaptor, these devices can be attached
       directly to an IDE bus in a computer.  Once implemented in this manner,
       operating systems such as FreeBSD see the device as a normal hard disk
-      (albeit small).  The M-Systems Disk-On-Chip product is based on the same
+      (albeit small).  The M-Systems &diskonchip; product is based on the same
       underlying flash memory technology as ATA compatible compact-flash
       cards, but resides in a DIP form factor and is not ATA compatible.  To
       use such a device, not only must you install it on a motherboard that
-      has a Disk-On-Chip socket, you must also build the `fla` driver into any
+      has a &diskonchip; socket, you must also build the `fla` driver into any
       FreeBSD kernel you wish to use it with.  Further, there is critical,
       manufacturer-specific data residing in the boot sector of this device,
       so you must take care not to install the FreeBSD (or any other) boot
@@ -148,7 +157,7 @@
 options         MD_ROOT         # md device usable as a potential root device
 pseudo-device   md              # memory disk</programlisting>
 
-    <para>Second, if you will be using the M-Systems Disk-On-Chip product, you
+    <para>Second, if you will be using the M-Systems &diskonchip; product, you
       must also include this line:</para>
 
     <programlisting>device          fla0    at isa?</programlisting>
@@ -244,7 +253,7 @@ pseudo-device   md              # memory disk</programlisting>
     <title>Building a File System From Scratch</title>
 
     <para>Because ATA compatible compact-flash cards are seen by FreeBSD as
-      normal IDE hard drives, as is a M-Systems Disk-On-Chip product (when you
+      normal IDE hard drives, as is a M-Systems &diskonchip; product (when you
       are running a kernel with the fla driver built in) you could
       theoretically install FreeBSD from the network using the kern and
       mfsroot floppies or from a CD.  Other than the fact that you should not
@@ -268,7 +277,7 @@ pseudo-device   md              # memory disk</programlisting>
       installation is not being performed, operations such as partitioning,
       labeling, file-system creation, etc. need to be performed by hand.  In
       addition to the kern and mfsroot floppy disks, you will also need to use
-      the fixit floppy.  If you are using a M-Systems Disk-On-Chip, the kernel
+      the fixit floppy.  If you are using a M-Systems &diskonchip;, the kernel
       on your kern floppy must have the <literal>fla</literal> option detailed
       in <xref linkend="kernel"> compiled into it.  Please see
       <xref linkend="kern.flp"> for instructions on creating a new kernel for
@@ -290,7 +299,7 @@ pseudo-device   md              # memory disk</programlisting>
 	  by pressing the <keycap>w</keycap> key (this is a hidden option on
 	  this screen).  When presented with a menu to choose a boot manager,
 	  take care to select <literal>None</literal> if you are using an
-	  M-Systems Disk-On-Chip.  If you are using an ATA compatible compact
+	  M-Systems &diskonchip;.  If you are using an ATA compatible compact
 	  flash card, you should choose the FreeBSD Boot Manager.  Now press
 	  the <keycap>q</keycap> key to quit the partition menu.  You will be
 	  shown the boot manager menu once more - repeat the choice you made
@@ -310,7 +319,7 @@ pseudo-device   md              # memory disk</programlisting>
 	      <row>
 		<entry align="center">ATA compatible</entry>
 
-		<entry align="center">Disk-On-Chip</entry>
+		<entry align="center">&diskonchip;</entry>
 	      </row>
 	    </thead>
 	    <tbody>
@@ -328,11 +337,11 @@ pseudo-device   md              # memory disk</programlisting>
 	</informaltable>
 
 	<para>At this point you will have entered the vi editor under the
-	  auspices of the disklabel command.  If you are using Disk-On-Chip,
+	  auspices of the disklabel command.  If you are using &diskonchip;,
 	  the first step will be to change the type value near the beginning
 	  of the file from <literal>ESDI</literal> to
 	  <literal>DOC2K</literal>.  Next, regardless of whether you are using
-	  Disk-On-Chip or ATA compatible compact flash media, you need to add
+	  &diskonchip; or ATA compatible compact flash media, you need to add
 	  an <literal>a:</literal> line at the end of the file.  This
 	  <literal>a:</literal> line should look like:</para>
 
@@ -351,7 +360,7 @@ pseudo-device   md              # memory disk</programlisting>
 	      <row>
 		<entry align="center">ATA compatible</entry>
 
-		<entry align="center">Disk-On-Chip</entry>
+		<entry align="center">&diskonchip;</entry>
 	      </row>
 	    </thead>
 	    <tbody>
@@ -378,7 +387,7 @@ pseudo-device   md              # memory disk</programlisting>
 	      <row>
 		<entry align="center">ATA compatible</entry>
 
-		<entry align="center">Disk-On-Chip</entry>
+		<entry align="center">&diskonchip;</entry>
 	      </row>
 	    </thead>
 	    <tbody>
@@ -438,12 +447,12 @@ pseudo-device   md              # memory disk</programlisting>
 
     <note>
       <para>This section of the article is relevant only to those using
-	M-Systems Disk-On-Chip flash media.</para>
+	M-Systems &diskonchip; flash media.</para>
     </note>
 
     <para>It is possible that your <filename>kern.flp</filename> boot floppy
       does not have a kernel with the <devicename>fla</devicename> driver
-      compiled into it necessary for the system to recognize the Disk-On-Chip.
+      compiled into it necessary for the system to recognize the &diskonchip;.
       If you have booted off of the installation floppies and are told that no
       disks are present, then you are probably lacking the
       <devicename>fla</devicename> driver in your kernel.</para>

en_US.ISO8859-1/articles/storage-devices/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.general;
+    </legalnotice>
+
     <abstract>
       <para>This article talks about storage devices with FreeBSD.</para>
     </abstract>

en_US.ISO8859-1/articles/vinum/article.sgml

@@ -3,6 +3,10 @@
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
+
 <!ENTITY vinum.ap "<application>Vinum</application>">
 %man;
 ]>
@@ -20,8 +24,12 @@
       <year>2001</year>
       <holder>Robert A. Van Valzah</holder>
     </copyright>
-    <pubdate>$Date: 2003-08-27 07:13:11 $ GMT</pubdate>
+    <pubdate>$Date: 2003-10-18 10:39:16 $ GMT</pubdate>
-    <releaseinfo>$Id: article.sgml,v 1.13 2003-08-27 07:13:11 blackend Exp $</releaseinfo>
+    <releaseinfo>$Id: article.sgml,v 1.14 2003-10-18 10:39:16 simon Exp $</releaseinfo>
+    <legalnotice id="trademarks" role="trademarks">
+      &tm-attrib.freebsd;
+      &tm-attrib.general;
+    </legalnotice>
   </articleinfo>
 
   <abstract>
@@ -2087,7 +2095,7 @@ ok <userinput>boot -s</userinput></screen>
 use strict;
 use FileHandle;
 
-my $config_tag1 = '$Id: article.sgml,v 1.13 2003-08-27 07:13:11 blackend Exp $';
+my $config_tag1 = '$Id: article.sgml,v 1.14 2003-10-18 10:39:16 simon Exp $';
 # Copyright (C) 2001 Robert A. Van Valzah 
 #
 # Bootstrap Vinum

en_US.ISO8859-1/articles/vm-design/article.sgml

@@ -7,6 +7,8 @@
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
 %freebsd;
 
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
 ]>
 
 <article>
@@ -27,6 +29,14 @@
       </author>
     </authorgroup>
 
+    <legalnotice id="trademarks" role="trademarks">
+      &tm-attrib.freebsd;
+      &tm-attrib.linux;
+      &tm-attrib.microsoft;
+      &tm-attrib.opengroup;
+      &tm-attrib.general;
+    </legalnotice>
+
     <abstract>
       <para>The title is really just a fancy way of saying that I am going to
 	attempt to describe the whole VM enchilada, hopefully in a way that
@@ -70,14 +80,14 @@
       be.  This is an important distinction to make and one that is
       unfortunately lost to many people.  The biggest error a programmer can
       make is to not learn from history, and this is precisely the error that
-      many other modern operating systems have made.  NT is the best example
+      many other modern operating systems have made.  &windowsnt; is the best example
       of this, and the consequences have been dire.  Linux also makes this
       mistake to some degree&mdash;enough that we BSD folk can make small
       jokes about it every once in a while, anyway.  Linux's problem is simply
       one of a lack of experience and history to compare ideas against, a
       problem that is easily and rapidly being addressed by the Linux
       community in the same way it has been addressed in the BSD
-      community&mdash;by continuous code development.  The NT folk, on the
+      community&mdash;by continuous code development.  The &windowsnt; folk, on the
       other hand, repeatedly make the same mistakes solved by &unix; decades ago
       and then spend years fixing them. Over and over again.  They have a
       severe case of <quote>not designed here</quote> and <quote>we are always
@@ -796,7 +806,7 @@
 	    This allows the cache to be left alone across a process context
 	    switch, which is very important.</para>
 
-	  <para>But in the Unix world you are dealing with virtual address
+	  <para>But in the &unix; world you are dealing with virtual address
 	    spaces, not physical address spaces.  Any program you write will
 	    see the virtual address space given to it.  The actual
 	    <emphasis>physical</emphasis> pages underlying that virtual

en_US.ISO8859-1/articles/zip-drive/article.sgml

@@ -5,12 +5,14 @@
 %man;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
 %freebsd;
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
 
 ]>
 
 <article>
   <articleinfo>
-    <title>ZIP Drives</title>
+    <title>&iomegazip; Drives</title>
 
     <authorgroup>
       <author>
@@ -22,12 +24,21 @@
 	</affiliation>
       </author>
     </authorgroup>
+
+    <legalnotice id="trademarks" role="trademarks">
+      &tm-attrib.freebsd;
+      &tm-attrib.adaptec;
+      &tm-attrib.iomega;
+      &tm-attrib.microsoft;
+      &tm-attrib.opengroup;
+      &tm-attrib.general;
+    </legalnotice>
   </articleinfo>
 
   <sect1>
-    <title>ZIP Drive Basics</title>
+    <title>&iomegazip; Drive Basics</title>
 
-    <para>ZIP disks are high capacity, removable, magnetic disks, which can be
+    <para>&iomegazip; disks are high capacity, removable, magnetic disks, which can be
       read or written by ZIP drives from IOMEGA corporation.  ZIP disks are
       similar to floppy disks, except that they are much faster, and have a
       much greater capacity.  While floppy disks typically hold 1.44
@@ -37,7 +48,7 @@
       1.44 megabyte floppies.</para>
 
     <para>IOMEGA also sells a higher capacity, higher performance drive called
-      the JAZZ drive.  JAZZ drives come in 1 gigabyte and 2 gigabyte
+      the &jaz;/JAZZ drive.  Jaz drives come in 1 gigabyte and 2 gigabyte
       sizes.</para>
 
     <para>ZIP drives are available as internal or external units, using one of
@@ -194,7 +205,7 @@
 
 	<para>You may need to change the target above to match the SCSI ID of
 	  your disk drive. You should also wire down the scbus0 entry to your
-	  controller.  For example, if you have an Adaptec 15xx controller,
+	  controller.  For example, if you have an &adaptec; 15xx controller,
 	  you would change
 
 	  <programlisting>controller scbus0</programlisting>
@@ -271,6 +282,6 @@
     <para>You can also create a FreeBSD file-system on the ZIP disk using
       &man.newfs.8;.  However, the disk will only be usable on a FreeBSD
       system, or perhaps a few other &unix; clones that recognize FreeBSD
-      file-systems.  (Definitely not DOS or Windows.)</para>
+      file-systems.  (Definitely not DOS or &windows;.)</para>
   </sect1>
 </article>