From bdavis@house.so14k.com  Fri Jan 21 05:18:19 2005
Return-Path: <bdavis@house.so14k.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C599E16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 21 Jan 2005 05:18:19 +0000 (GMT)
Received: from ender.liquidneon.com (ender.liquidneon.com [64.78.150.163])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 23A3243D41
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 21 Jan 2005 05:18:19 +0000 (GMT)
	(envelope-from bdavis@house.so14k.com)
Received: from localhost (localhost [127.0.0.1])
	by ender.liquidneon.com (Postfix) with ESMTP id 6FBD543C5
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 20 Jan 2005 22:18:18 -0700 (MST)
Received: from ender.liquidneon.com ([127.0.0.1])
 by localhost (ender.liquidneon.com [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 71921-03 for <FreeBSD-gnats-submit@freebsd.org>;
 Thu, 20 Jan 2005 22:18:18 -0700 (MST)
Received: from mccaffrey.house.so14k.com (gw.house.so14k.com [216.87.87.128])
	by ender.liquidneon.com (Postfix) with ESMTP id 55E4240F9
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 20 Jan 2005 22:18:17 -0700 (MST)
Received: by mccaffrey.house.so14k.com (Postfix, from userid 1001)
	id 2E0C9E79; Thu, 20 Jan 2005 22:18:15 -0700 (MST)
Message-Id: <20050121051815.2E0C9E79@mccaffrey.house.so14k.com>
Date: Thu, 20 Jan 2005 22:18:15 -0700 (MST)
From: Brad Davis <so14k@so14k.com>
Reply-To: Brad Davis <so14k@so14k.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Add Compaq to the list on entities
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         76524
>Category:       docs
>Synopsis:       Add Compaq to the list on entities
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 21 05:20:19 GMT 2005
>Closed-Date:    Sat Feb 19 15:05:28 GMT 2005
>Last-Modified:  Sat Feb 19 15:05:28 GMT 2005
>Originator:     Brad Davis
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
>Environment:
System: FreeBSD mccaffrey.house.so14k.com 4.10-STABLE FreeBSD 4.10-STABLE #0: Fri May 28 08:02:41 MDT 2004 root@mccaffrey.house.so14k.com:/usr/obj/usr/src/sys/MCCAFFREY i386
>Description:
	Add Compaq to the list on entities and apply it to the doc/ tree.
>How-To-Repeat:
	
>Fix:
diff -ruN doc-ori/en_US.ISO8859-1/articles/contributors/article.sgml doc/en_US.ISO8859-1/articles/contributors/article.sgml
--- doc-ori/en_US.ISO8859-1/articles/contributors/article.sgml  Wed Jan 19 07:01:02 2005
+++ doc/en_US.ISO8859-1/articles/contributors/article.sgml      Thu Jan 20 21:40:12 2005
@@ -205,7 +205,7 @@
          </listitem>
 
          <listitem>
-           <para><ulink url="http://www.compaq.com">Compaq</ulink>
+           <para><ulink url="http://www.compaq.com">&compaq;</ulink>
               has donated a variety of Alpha systems to the FreeBSD
               Project.  Among the many generous donations are 4
               AlphaStation DS10s, an AlphaServer DS20,
diff -ruN doc-ori/en_US.ISO8859-1/articles/explaining-bsd/article.sgml doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml
--- doc-ori/en_US.ISO8859-1/articles/explaining-bsd/article.sgml        Wed Jan 19 07:01:02 2005
+++ doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml    Thu Jan 20 21:46:43 2005
@@ -416,7 +416,7 @@
            end users, and is a favourite of web content providers.  It runs
            on a number of platforms, including i386 based systems (<quote>PCs</quote>),
            systems based on the AMD 64-bit processors, &ultrasparc; based systems,
-           systems based on Compaq's Alpha processors and systems based around
+           systems based on &compaq;'s Alpha processors and systems based around
            the NEC PC-98 specification.  The FreeBSD project has
            significantly more users than the other projects.</para>
        </listitem>
diff -ruN doc-ori/en_US.ISO8859-1/articles/releng-packages/article.sgml doc/en_US.ISO8859-1/articles/releng-packages/article.sgml 
--- doc-ori/en_US.ISO8859-1/articles/releng-packages/article.sgml       Wed Jan 19 07:01:02 2005
+++ doc/en_US.ISO8859-1/articles/releng-packages/article.sgml   Thu Jan 20 21:50:41 2005
@@ -90,7 +90,7 @@
         Exodus in Santa Clara, CA.</para>
 
       <para>The <quote>Ports Cluster</quote> for the Alpha
-        architecture consists of 7 PWS 500A machines donated by Compaq
+        architecture consists of 7 PWS 500A machines donated by &compaq;
         and also co-located with Yahoo's facilities.</para>
     </sect2>
   </sect1>
diff -ruN doc-ori/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml doc/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml 
--- doc-ori/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml        Wed Jan 19 07:01:02 2005
+++ doc/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml    Thu Jan 20 21:54:01 2005
@@ -153,9 +153,9 @@
       reports changes happening at its ports. There are currently two
       specifications for host controllers available: <ulink
       url="http://developer.intel.com/design/USB/UHCI11D.htm">Universal
-      Host Controller Interface</ulink> (UHCI; Intel) and <ulink
+      Host Controller Interface</ulink> (UHCI; &intel;) and <ulink
       url="http://www.compaq.com/productinfo/development/openhci.html">Open
-      Host Controller Interface</ulink> (OHCI; Compaq, Microsoft,
+      Host Controller Interface</ulink> (OHCI; &compaq;, Microsoft,
       National Semiconductor). The UHCI specification has been
       designed to reduce hardware complexity by requiring the host
       controller driver to supply a complete schedule of the transfers
diff -ruN doc-ori/en_US.ISO8859-1/books/corp-net-guide/book.sgml doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml 
--- doc-ori/en_US.ISO8859-1/books/corp-net-guide/book.sgml      Wed Jan 19 07:01:02 2005
+++ doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml  Thu Jan 20 21:56:01 2005
@@ -668,7 +668,7 @@
 
        <para>As an alternate, the Microsoft Networking DOS 16-bit TCP/IP
          client under Win31 contains a Winsock, as does Microsoft TCP/IP for
-         WfW.  The target machine used here is a Compaq Deskpro 386/33 with
+         WfW.  The target machine used here is a &compaq; Deskpro 386/33 with
          12MB of ram with an operating version of Windows 3.1, and a 3com
          3C579 EISA network card.  The instructions assume an LPR printserver
          on the network, named <hostid>mainprinter.my.domain.com</hostid>
diff -ruN doc-ori/en_US.ISO8859-1/books/faq/book.sgml doc/en_US.ISO8859-1/books/faq/book.sgml 
--- doc-ori/en_US.ISO8859-1/books/faq/book.sgml Wed Jan 19 07:01:03 2005
+++ doc/en_US.ISO8859-1/books/faq/book.sgml     Thu Jan 20 21:58:12 2005
@@ -94,7 +94,7 @@
 
         <answer>
          <para>Briefly, FreeBSD is a &unix;&nbsp;like operating system for
-           the Alpha/AXP, AMD64 and Intel EM64T, &i386; IA-64,
+           the Alpha/AXP, AMD64 and &intel; EM64T, &i386; IA-64,
            PC-98, and &ultrasparc; platforms
            based on U.C. Berkeley's <quote>4.4BSD-Lite</quote>
            release, with some <quote>4.4BSD-Lite2</quote>
diff -ruN doc-ori/en_US.ISO8859-1/books/handbook/config/chapter.sgml  doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml 
--- doc-ori/en_US.ISO8859-1/books/handbook/config/chapter.sgml  Thu Jan 20 17:08:33 2005
+++ doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml      Thu Jan 20 21:59:31 2005
@@ -3070,7 +3070,7 @@
          <para><ulink
            url="http://www.cpqlinux.com/acpi-howto.html#fix_broken_dsdt">
            <acronym>DSDT</acronym> debugging resource</ulink>.
-           (Uses Compaq as an example but generally useful.)</para>
+           (Uses &compaq; as an example but generally useful.)</para>
        </listitem>
       </itemizedlist>
     </sect2>
diff -ruN doc-ori/en_US.ISO8859-1/books/handbook/disks/chapter.sgml doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml 
--- doc-ori/en_US.ISO8859-1/books/handbook/disks/chapter.sgml   Wed Jan 19 07:01:03 2005
+++ doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml       Thu Jan 20 22:01:34 2005
@@ -133,7 +133,7 @@
              <literal>mlxd</literal> and <literal>mlyd</literal>
              for &mylex;,
              <literal>amrd</literal> for AMI &megaraid;,
-             <literal>idad</literal> for Compaq Smart RAID,
+             <literal>idad</literal> for &compaq; Smart RAID,
              <literal>twed</literal> for &tm.3ware; RAID.</entry>
          </row>
        </tbody>
diff -ruN doc-ori/en_US.ISO8859-1/books/handbook/install/chapter.sgml doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml
--- doc-ori/en_US.ISO8859-1/books/handbook/install/chapter.sgml Wed Jan 19 07:01:03 2005
+++ doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml     Thu Jan 20 22:07:29 2005
@@ -346,7 +346,7 @@
          or an IDE disk, as long as your machine is capable of
          booting from it.</para>
 
-       <para>Following the conventions of the Digital / Compaq
+       <para>Following the conventions of the Digital / &compaq;
          manuals all SRM input is shown in uppercase.  SRM is case
          insensitive.</para>
 
@@ -4796,7 +4796,7 @@
     <indexterm><primary>hardware</primary></indexterm>
     <para>FreeBSD currently runs on a wide variety of ISA, VLB, EISA, and PCI
       bus-based PCs with Intel, AMD, Cyrix, or NexGen <quote>x86</quote>
-      processors, as well as a number of machines based on the Compaq Alpha
+      processors, as well as a number of machines based on the &compaq; Alpha
       processor.  Support for generic IDE or ESDI drive configurations,
       various SCSI controllers, PCMCIA cards, USB devices, and network and
       serial cards is also provided.  FreeBSD also supports IBM's microchannel
@@ -4988,7 +4988,7 @@
          <indexterm><primary>SRM</primary></indexterm>
 
          <answer>
-           <para>No.  &os;, like Compaq Tru64 and VMS, will only boot
+           <para>No.  &os;, like &compaq; Tru64 and VMS, will only boot
            from the SRM console.</para>
          </answer>
        </qandaentry>
@@ -5006,7 +5006,7 @@
 
        <qandaentry>
          <question>
-           <para>Can I mount my Compaq Tru64 or VMS filesystems?</para>
+           <para>Can I mount my &compaq; Tru64 or VMS filesystems?</para>
          </question>
 
          <answer>
diff -ruN doc-ori/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml 
--- doc-ori/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml Wed Jan 19 07:01:03 2005
+++ doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml     Thu Jan 20 22:10:56 2005
@@ -1573,14 +1573,14 @@
             nor world readable (mode 600)!  Use the
             <command>chmod</command> command, if appropriate.</para></note>
 
-         <indexterm><primary>Tru64 UNIX</primary></indexterm>
+         <indexterm><primary>&tru64; UNIX</primary></indexterm>
 
           <para>When you have finished, it is time to initialize the
             NIS maps!  FreeBSD includes a script named
             <command>ypinit</command> to do this for you (see its
             manual page for more information).  Note that this script
             is available on most &unix; Operating Systems, but not on
-            all.  On Digital UNIX/Compaq Tru64 UNIX it is called
+            all.  On Digital UNIX/&compaq; &tru64; UNIX it is called
             <command>ypsetup</command>.  Because we are generating
             maps for an NIS master, we are going to pass the
             <option>-m</option> option to <command>ypinit</command>.
diff -ruN doc-ori/share/sgml/trademarks.ent doc/share/sgml/trademarks.ent
--- doc-ori/share/sgml/trademarks.ent   Wed Jan 19 07:01:05 2005
+++ doc/share/sgml/trademarks.ent       Thu Jan 20 22:13:22 2005
@@ -119,6 +119,14 @@
   trademarks of Heidelberger Druckmaschinen AG in the U.S. and other
   countries.</para>">
 
+<!-- http://www.hp.com/hpinfo/abouthp/trademarks/ -->
+<!ENTITY tm-attrib.hp "<para>HP and Hewlett-Packard are trademarks of
+  Hewlett-Packard Development Company, L.P.</para>">
+<!ENTITY hp "<trademark class='registered'>Hewlett-Packard</trademark>">
+<!ENTITY hp-ux "<trademark class='registered'>HP-UX</trademark>">
+<!ENTITY compaq "<trademark class='registered'>Compaq</trademark>">
+<!ENTITY tru64 "<trademark class='registered'>Tru64</trademark>">
+
 <!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, OS/2, PowerPC, PS/2, S/390, and ThinkPad are
   trademarks of International Business Machines Corporation in the
   United States, other countries, or both.</para>">
>Release-Note:
>Audit-Trail:

From: Ceri Davies <ceri@submonkey.net>
To: Brad Davis <so14k@so14k.com>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: docs/76524: Add Compaq to the list on entities
Date: Fri, 21 Jan 2005 08:56:57 +0000

 Hi Brad,
 
 On Thu, Jan 20, 2005 at 10:18:15PM -0700, Brad Davis wrote:
 >  
 > +<!-- http://www.hp.com/hpinfo/abouthp/trademarks/ -->
 > +<!ENTITY tm-attrib.hp "<para>HP and Hewlett-Packard are trademarks of
 > +  Hewlett-Packard Development Company, L.P.</para>">
 > +<!ENTITY hp "<trademark class='registered'>Hewlett-Packard</trademark>">
 > +<!ENTITY hp-ux "<trademark class='registered'>HP-UX</trademark>">
 > +<!ENTITY compaq "<trademark class='registered'>Compaq</trademark>">
 > +<!ENTITY tru64 "<trademark class='registered'>Tru64</trademark>">
 > +
 
 None of these are listed at the URL given - did they come from somewhere
 else?
 
 Ceri

From: "Simon L. Nielsen" <simon@FreeBSD.org>
To: Brad Davis <so14k@so14k.com>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: docs/76524: Add Compaq to the list on entities
Date: Fri, 21 Jan 2005 10:15:10 +0100

 --r5Pyd7+fXNt84Ff3
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 On 2005.01.20 22:18:15 -0700, Brad Davis wrote:
 
 > diff -ruN doc-ori/share/sgml/trademarks.ent doc/share/sgml/trademarks.ent
 > --- doc-ori/share/sgml/trademarks.ent   Wed Jan 19 07:01:05 2005
 > +++ doc/share/sgml/trademarks.ent       Thu Jan 20 22:13:22 2005
 > @@ -119,6 +119,14 @@
 >    trademarks of Heidelberger Druckmaschinen AG in the U.S. and other
 >    countries.</para>">
 > =20
 > +<!-- http://www.hp.com/hpinfo/abouthp/trademarks/ -->
 
 Ah, thats new.  They didn't use to have any trademark information on
 their site.
 
 The page explicitly state:
 
 	HP does not use or require the use of trademark legends or
 	acknowledgements unless agreed to by both parties involved in
 	the development of a specific business or legal contract.
 
 So, it does not appear to me like we have to change anything?
 
 --=20
 Simon L. Nielsen
 
 --r5Pyd7+fXNt84Ff3
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (FreeBSD)
 
 iD8DBQFB8Mgdh9pcDSc1mlERAl4oAJ4z84lSw2IckKir7Pbp6ZfLWg8rZQCglT/1
 nye+Cl99Ap5wpQmBa5et0IM=
 =P/nq
 -----END PGP SIGNATURE-----
 
 --r5Pyd7+fXNt84Ff3--
State-Changed-From-To: open->closed 
State-Changed-By: simon 
State-Changed-When: Sat Feb 19 15:03:30 GMT 2005 
State-Changed-Why:  
I committed the "Intel EM64T" part, but not the UHCI part since 
"Intel" is used a company reference, not a product reference and 
therefor I don't think the trademark symbol should be used.  I didn't 
commit any of the compaq parts as per the audit-trail and general 
followup on the PR.  Thanks for the submission! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=76524 
>Unformatted:
