*.sgml:

- Use trademark entities
 - Add trademark attributions.
 - Always use correct case for trademarks.
 - Don't join trademarks with other words, e.g. using hyphens.

trademark.ent:
 - Add entities for more trademarks / companies.
 - Sort the Sun trademark attribution entity.

en_US.ISO8859-1/articles/ipsec-must/article.sgml

@@ -7,6 +7,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,12 @@
 
     <pubdate>3 May 1999</pubdate>
 
+    <legalnotice id="trademarks" role="trademarks">
+      &tm-attrib.freebsd;
+      &tm-attrib.opengroup;
+      &tm-attrib.general;
+    </legalnotice>
+
     <abstract>
       <para>You installed IPsec and it seems to be working. How do you
         know?  I describe a method for experimentally verifying that IPsec is
@@ -115,7 +124,7 @@
       </step>
 
       <step>
-	<para>In the <quote>secure</quote> window, run the Unix
+	<para>In the <quote>secure</quote> window, run the &unix;
 	  command &man.yes.1;, which will stream the <literal>y</literal>
 	  character.  After a while, stop this.  Switch to the
 	  insecure window, and repeat.  After a while, stop.</para>