Add trademark symbols and attributions:

 - Add trademark tags as needed, generally on first use in each
   article.
 - Add an attribution to the legal section mentioning all trademarks
   referenced.
 - Always use correct case for trademarks.
 - Don't join trademarks with other words, e.g. using hyphens.

trademark.ent:
 - Commonly used trademarks are defined as entities for ease of use.
 - All trademark attributions are defined as entities for ease of use.

Approved by:	ceri (mentor)

1 files changed, 18 insertions, 5 deletions

diff --git a/en_US.ISO8859-1/articles/5-roadmap/article.sgml b/en_US.ISO8859-1/articles/5-roadmap/article.sgml
index 2d8161335a..c0e7c1f503 100644
--- a/en_US.ISO8859-1/articles/5-roadmap/article.sgml
+++ b/en_US.ISO8859-1/articles/5-roadmap/article.sgml
@@ -14,6 +14,9 @@
 <!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
 %mailing-lists;
 
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
+
 <!ENTITY t.releng.3 "<literal>RELENG_3</literal>">
 <!ENTITY t.releng.4 "<literal>RELENG_4</literal>">
 <!ENTITY t.releng.5 "<literal>RELENG_5</literal>">
@@ -38,6 +41,16 @@
       <holder role="mailto:re@FreeBSD.org">The &os; Release
         Engineering Team</holder>
     </copyright>
+
+    <legalnotice id="trademarks" role="trademarks">
+      &tm-attrib.freebsd;
+      &tm-attrib.ieee;
+      &tm-attrib.intel;
+      &tm-attrib.sparc;
+      &tm-attrib.sun;
+      &tm-attrib.opengroup;
+      &tm-attrib.general;
+    </legalnotice>
   </articleinfo>
 
   <sect1 id="intro">
@@ -45,7 +58,7 @@
 
     <para>After nearly three years of work, &os; 5.0 was released in January
       of 2003.  Features like the GEOM block layer, Mandatory Access Controls,
-      ACPI, sparc64 and ia64 platform support, and UFS snapshots, background
+      ACPI, &sparc64; and ia64 platform support, and UFS snapshots, background
       filesystem checks, and 64-bit inode sizes make it an exciting operating
       system for both desktop and production users.  However, some important
       features are not complete.  The foundations for fine-grained locking
@@ -284,7 +297,7 @@
               decision on which parts of the network stack should be locked and
               taken out from under Giant for &t.releng.5; should be made no later
               than March 15.  Work on the IP, TCP, UDP,raw IP, routing sockets,
-              and Unix domain sockets stands a good chance of being complete in
+              and &unix; domain sockets stands a good chance of being complete in
               time for &t.releng.5;.</para>
 
             <para>If the decision is made to not lift Giant from the stack,
@@ -329,8 +342,8 @@
           <para>KSE: The kernel side of KSE must be functionally complete and
             have undergone a security audit.  libkse must be complete enough to
             demonstrate a real-world application running correctly on it using
-            the standard POSIX Threads API.  Examples would be apache 2.0,
-            Java, and/or mozilla.  A functional regression test suite is also a
+            the standard &posix; Threads API.  Examples would be apache 2.0,
+            &java;, and/or mozilla.  A functional regression test suite is also a
             requirement for &t.releng.5; and should test signal delivery,
             scheduling, performance, and process security/credentials for both
             KSE and non-KSE processes.  KSE kernel and userland components must
@@ -341,7 +354,7 @@
         </listitem>
 
         <listitem>
-          <para>busdma interface and drivers: architectures like PAE/i386 and
+          <para>busdma interface and drivers: architectures like PAE/&i386; and
             sparc64 which don't have a direct mapping between host memory
             address space and expansion bus address space require the
             elimination for vtophys() and friends.  The busdma interface was