View | Details | Raw Unified | Return to bug 76524
Collapse All | Expand All

(-)doc/en_US.ISO8859-1/articles/contributors/article.sgml Thu Jan 20 21:40:12 2005 (-1 / +1 lines)
Lines 205-211 Link Here
205
         </listitem>
205
         </listitem>
206
206
207
         <listitem>
207
         <listitem>
208
           <para><ulink url="http://www.compaq.com">Compaq</ulink>
208
           <para><ulink url="http://www.compaq.com">&compaq;</ulink>
209
              has donated a variety of Alpha systems to the FreeBSD
209
              has donated a variety of Alpha systems to the FreeBSD
210
              Project.  Among the many generous donations are 4
210
              Project.  Among the many generous donations are 4
211
              AlphaStation DS10s, an AlphaServer DS20,
211
              AlphaStation DS10s, an AlphaServer DS20,
(-)doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml Thu Jan 20 21:46:43 2005 (-1 / +1 lines)
Lines 416-422 Link Here
416
           end users, and is a favourite of web content providers.  It runs
416
           end users, and is a favourite of web content providers.  It runs
417
           on a number of platforms, including i386 based systems (<quote>PCs</quote>),
417
           on a number of platforms, including i386 based systems (<quote>PCs</quote>),
418
           systems based on the AMD 64-bit processors, &ultrasparc; based systems,
418
           systems based on the AMD 64-bit processors, &ultrasparc; based systems,
419
           systems based on Compaq's Alpha processors and systems based around
419
           systems based on &compaq;'s Alpha processors and systems based around
420
           the NEC PC-98 specification.  The FreeBSD project has
420
           the NEC PC-98 specification.  The FreeBSD project has
421
           significantly more users than the other projects.</para>
421
           significantly more users than the other projects.</para>
422
       </listitem>
422
       </listitem>
(-)doc/en_US.ISO8859-1/articles/releng-packages/article.sgml Thu Jan 20 21:50:41 2005 (-1 / +1 lines)
Lines 90-96 Link Here
90
        Exodus in Santa Clara, CA.</para>
90
        Exodus in Santa Clara, CA.</para>
91
91
92
      <para>The <quote>Ports Cluster</quote> for the Alpha
92
      <para>The <quote>Ports Cluster</quote> for the Alpha
93
        architecture consists of 7 PWS 500A machines donated by Compaq
93
        architecture consists of 7 PWS 500A machines donated by &compaq;
94
        and also co-located with Yahoo's facilities.</para>
94
        and also co-located with Yahoo's facilities.</para>
95
    </sect2>
95
    </sect2>
96
  </sect1>
96
  </sect1>
(-)doc/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml Thu Jan 20 21:54:01 2005 (-2 / +2 lines)
Lines 153-161 Link Here
153
      reports changes happening at its ports. There are currently two
153
      reports changes happening at its ports. There are currently two
154
      specifications for host controllers available: <ulink
154
      specifications for host controllers available: <ulink
155
      url="http://developer.intel.com/design/USB/UHCI11D.htm">Universal
155
      url="http://developer.intel.com/design/USB/UHCI11D.htm">Universal
156
      Host Controller Interface</ulink> (UHCI; Intel) and <ulink
156
      Host Controller Interface</ulink> (UHCI; &intel;) and <ulink
157
      url="http://www.compaq.com/productinfo/development/openhci.html">Open
157
      url="http://www.compaq.com/productinfo/development/openhci.html">Open
158
      Host Controller Interface</ulink> (OHCI; Compaq, Microsoft,
158
      Host Controller Interface</ulink> (OHCI; &compaq;, Microsoft,
159
      National Semiconductor). The UHCI specification has been
159
      National Semiconductor). The UHCI specification has been
160
      designed to reduce hardware complexity by requiring the host
160
      designed to reduce hardware complexity by requiring the host
161
      controller driver to supply a complete schedule of the transfers
161
      controller driver to supply a complete schedule of the transfers
(-)doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml Thu Jan 20 21:56:01 2005 (-1 / +1 lines)
Lines 668-674 Link Here
668
668
669
       <para>As an alternate, the Microsoft Networking DOS 16-bit TCP/IP
669
       <para>As an alternate, the Microsoft Networking DOS 16-bit TCP/IP
670
         client under Win31 contains a Winsock, as does Microsoft TCP/IP for
670
         client under Win31 contains a Winsock, as does Microsoft TCP/IP for
671
         WfW.  The target machine used here is a Compaq Deskpro 386/33 with
671
         WfW.  The target machine used here is a &compaq; Deskpro 386/33 with
672
         12MB of ram with an operating version of Windows 3.1, and a 3com
672
         12MB of ram with an operating version of Windows 3.1, and a 3com
673
         3C579 EISA network card.  The instructions assume an LPR printserver
673
         3C579 EISA network card.  The instructions assume an LPR printserver
674
         on the network, named <hostid>mainprinter.my.domain.com</hostid>
674
         on the network, named <hostid>mainprinter.my.domain.com</hostid>
(-)doc/en_US.ISO8859-1/books/faq/book.sgml Thu Jan 20 21:58:12 2005 (-1 / +1 lines)
Lines 94-100 Link Here
94
94
95
        <answer>
95
        <answer>
96
         <para>Briefly, FreeBSD is a &unix;&nbsp;like operating system for
96
         <para>Briefly, FreeBSD is a &unix;&nbsp;like operating system for
97
           the Alpha/AXP, AMD64 and Intel EM64T, &i386; IA-64,
97
           the Alpha/AXP, AMD64 and &intel; EM64T, &i386; IA-64,
98
           PC-98, and &ultrasparc; platforms
98
           PC-98, and &ultrasparc; platforms
99
           based on U.C. Berkeley's <quote>4.4BSD-Lite</quote>
99
           based on U.C. Berkeley's <quote>4.4BSD-Lite</quote>
100
           release, with some <quote>4.4BSD-Lite2</quote>
100
           release, with some <quote>4.4BSD-Lite2</quote>
(-)doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml Thu Jan 20 21:59:31 2005 (-1 / +1 lines)
Lines 3070-3076 Link Here
3070
         <para><ulink
3070
         <para><ulink
3071
           url="http://www.cpqlinux.com/acpi-howto.html#fix_broken_dsdt">
3071
           url="http://www.cpqlinux.com/acpi-howto.html#fix_broken_dsdt">
3072
           <acronym>DSDT</acronym> debugging resource</ulink>.
3072
           <acronym>DSDT</acronym> debugging resource</ulink>.
3073
           (Uses Compaq as an example but generally useful.)</para>
3073
           (Uses &compaq; as an example but generally useful.)</para>
3074
       </listitem>
3074
       </listitem>
3075
      </itemizedlist>
3075
      </itemizedlist>
3076
    </sect2>
3076
    </sect2>
(-)doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml Thu Jan 20 22:01:34 2005 (-1 / +1 lines)
Lines 133-139 Link Here
133
             <literal>mlxd</literal> and <literal>mlyd</literal>
133
             <literal>mlxd</literal> and <literal>mlyd</literal>
134
             for &mylex;,
134
             for &mylex;,
135
             <literal>amrd</literal> for AMI &megaraid;,
135
             <literal>amrd</literal> for AMI &megaraid;,
136
             <literal>idad</literal> for Compaq Smart RAID,
136
             <literal>idad</literal> for &compaq; Smart RAID,
137
             <literal>twed</literal> for &tm.3ware; RAID.</entry>
137
             <literal>twed</literal> for &tm.3ware; RAID.</entry>
138
         </row>
138
         </row>
139
       </tbody>
139
       </tbody>
(-)doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml Thu Jan 20 22:07:29 2005 (-4 / +4 lines)
Lines 346-352 Link Here
346
         or an IDE disk, as long as your machine is capable of
346
         or an IDE disk, as long as your machine is capable of
347
         booting from it.</para>
347
         booting from it.</para>
348
348
349
       <para>Following the conventions of the Digital / Compaq
349
       <para>Following the conventions of the Digital / &compaq;
350
         manuals all SRM input is shown in uppercase.  SRM is case
350
         manuals all SRM input is shown in uppercase.  SRM is case
351
         insensitive.</para>
351
         insensitive.</para>
352
352
Lines 4796-4802 Link Here
4796
    <indexterm><primary>hardware</primary></indexterm>
4796
    <indexterm><primary>hardware</primary></indexterm>
4797
    <para>FreeBSD currently runs on a wide variety of ISA, VLB, EISA, and PCI
4797
    <para>FreeBSD currently runs on a wide variety of ISA, VLB, EISA, and PCI
4798
      bus-based PCs with Intel, AMD, Cyrix, or NexGen <quote>x86</quote>
4798
      bus-based PCs with Intel, AMD, Cyrix, or NexGen <quote>x86</quote>
4799
      processors, as well as a number of machines based on the Compaq Alpha
4799
      processors, as well as a number of machines based on the &compaq; Alpha
4800
      processor.  Support for generic IDE or ESDI drive configurations,
4800
      processor.  Support for generic IDE or ESDI drive configurations,
4801
      various SCSI controllers, PCMCIA cards, USB devices, and network and
4801
      various SCSI controllers, PCMCIA cards, USB devices, and network and
4802
      serial cards is also provided.  FreeBSD also supports IBM's microchannel
4802
      serial cards is also provided.  FreeBSD also supports IBM's microchannel
Lines 4988-4994 Link Here
4988
         <indexterm><primary>SRM</primary></indexterm>
4988
         <indexterm><primary>SRM</primary></indexterm>
4989
4989
4990
         <answer>
4990
         <answer>
4991
           <para>No.  &os;, like Compaq Tru64 and VMS, will only boot
4991
           <para>No.  &os;, like &compaq; Tru64 and VMS, will only boot
4992
           from the SRM console.</para>
4992
           from the SRM console.</para>
4993
         </answer>
4993
         </answer>
4994
       </qandaentry>
4994
       </qandaentry>
Lines 5006-5012 Link Here
5006
5006
5007
       <qandaentry>
5007
       <qandaentry>
5008
         <question>
5008
         <question>
5009
           <para>Can I mount my Compaq Tru64 or VMS filesystems?</para>
5009
           <para>Can I mount my &compaq; Tru64 or VMS filesystems?</para>
5010
         </question>
5010
         </question>
5011
5011
5012
         <answer>
5012
         <answer>
(-)doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml Thu Jan 20 22:10:56 2005 (-2 / +2 lines)
Lines 1573-1586 Link Here
1573
            nor world readable (mode 600)!  Use the
1573
            nor world readable (mode 600)!  Use the
1574
            <command>chmod</command> command, if appropriate.</para></note>
1574
            <command>chmod</command> command, if appropriate.</para></note>
1575
1575
1576
         <indexterm><primary>Tru64 UNIX</primary></indexterm>
1576
         <indexterm><primary>&tru64; UNIX</primary></indexterm>
1577
1577
1578
          <para>When you have finished, it is time to initialize the
1578
          <para>When you have finished, it is time to initialize the
1579
            NIS maps!  FreeBSD includes a script named
1579
            NIS maps!  FreeBSD includes a script named
1580
            <command>ypinit</command> to do this for you (see its
1580
            <command>ypinit</command> to do this for you (see its
1581
            manual page for more information).  Note that this script
1581
            manual page for more information).  Note that this script
1582
            is available on most &unix; Operating Systems, but not on
1582
            is available on most &unix; Operating Systems, but not on
1583
            all.  On Digital UNIX/Compaq Tru64 UNIX it is called
1583
            all.  On Digital UNIX/&compaq; &tru64; UNIX it is called
1584
            <command>ypsetup</command>.  Because we are generating
1584
            <command>ypsetup</command>.  Because we are generating
1585
            maps for an NIS master, we are going to pass the
1585
            maps for an NIS master, we are going to pass the
1586
            <option>-m</option> option to <command>ypinit</command>.
1586
            <option>-m</option> option to <command>ypinit</command>.
(-)doc/share/sgml/trademarks.ent Thu Jan 20 22:13:22 2005 (+8 lines)
Lines 119-124 Link Here
119
  trademarks of Heidelberger Druckmaschinen AG in the U.S. and other
119
  trademarks of Heidelberger Druckmaschinen AG in the U.S. and other
120
  countries.</para>">
120
  countries.</para>">
121
121
122
<!-- http://www.hp.com/hpinfo/abouthp/trademarks/ -->
123
<!ENTITY tm-attrib.hp "<para>HP and Hewlett-Packard are trademarks of
124
  Hewlett-Packard Development Company, L.P.</para>">
125
<!ENTITY hp "<trademark class='registered'>Hewlett-Packard</trademark>">
126
<!ENTITY hp-ux "<trademark class='registered'>HP-UX</trademark>">
127
<!ENTITY compaq "<trademark class='registered'>Compaq</trademark>">
128
<!ENTITY tru64 "<trademark class='registered'>Tru64</trademark>">
129
122
<!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, OS/2, PowerPC, PS/2, S/390, and ThinkPad are
130
<!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, OS/2, PowerPC, PS/2, S/390, and ThinkPad are
123
  trademarks of International Business Machines Corporation in the
131
  trademarks of International Business Machines Corporation in the
124
  United States, other countries, or both.</para>">
132
  United States, other countries, or both.</para>">

Return to bug 76524