Attachment 50196 Details for Bug 76524 – file.diff

[patch] file.diff

file.diff (text/plain), 10.15 KB, created by Brad Davis on 2005-01-21 05:20:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brad Davis

Created: 2005-01-21 05:20:19 UTC

Size: 10.15 KB

patch

obsolete

>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>">
> 
>+
>+<!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>">

Actions: View | Diff

Attachments on bug 76524: 50196