From owner-freebsd-doc@FreeBSD.ORG Fri Jan 21 05:20:20 2005 Return-Path: Delivered-To: freebsd-doc@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CBD9D16A4CE for ; Fri, 21 Jan 2005 05:20:20 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5279643D45 for ; Fri, 21 Jan 2005 05:20:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id j0L5KKBQ028858 for ; Fri, 21 Jan 2005 05:20:20 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id j0L5KKSD028856; Fri, 21 Jan 2005 05:20:20 GMT (envelope-from gnats) Resent-Date: Fri, 21 Jan 2005 05:20:20 GMT Resent-Message-Id: <200501210520.j0L5KKSD028856@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-doc@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Brad Davis Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C599E16A4CE for ; 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 ; 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 ; 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 ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: docs/76524: Add Compaq to the list on entities X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Brad Davis List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Jan 2005 05:20:21 -0000 >Number: 76524 >Category: docs >Synopsis: Add Compaq to the list on entities >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-doc >State: open >Quarter: >Keywords: >Date-Required: >Class: doc-bug >Submitter-Id: current-users >Arrival-Date: Fri Jan 21 05:20:19 GMT 2005 >Closed-Date: >Last-Modified: >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 @@ - Compaq + &compaq; 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 (PCs), 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. 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. The Ports Cluster 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. 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: Universal - Host Controller Interface (UHCI; Intel) and (UHCI; &intel;) and Open - Host Controller Interface (OHCI; Compaq, Microsoft, + Host Controller Interface (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 @@ 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 mainprinter.my.domain.com 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 @@ Briefly, FreeBSD is a &unix; 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 4.4BSD-Lite release, with some 4.4BSD-Lite2 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 @@ DSDT debugging resource. - (Uses Compaq as an example but generally useful.) + (Uses &compaq; as an example but generally useful.) 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 @@ mlxd and mlyd for &mylex;, amrd for AMI &megaraid;, - idad for Compaq Smart RAID, + idad for &compaq; Smart RAID, twed for &tm.3ware; RAID. 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. - Following the conventions of the Digital / Compaq + Following the conventions of the Digital / &compaq; manuals all SRM input is shown in uppercase. SRM is case insensitive. @@ -4796,7 +4796,7 @@ hardware FreeBSD currently runs on a wide variety of ISA, VLB, EISA, and PCI bus-based PCs with Intel, AMD, Cyrix, or NexGen x86 - 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 @@ SRM - No. &os;, like Compaq Tru64 and VMS, will only boot + No. &os;, like &compaq; Tru64 and VMS, will only boot from the SRM console. @@ -5006,7 +5006,7 @@ - Can I mount my Compaq Tru64 or VMS filesystems? + Can I mount my &compaq; Tru64 or VMS filesystems? 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 chmod command, if appropriate. - Tru64 UNIX + &tru64; UNIX When you have finished, it is time to initialize the NIS maps! FreeBSD includes a script named ypinit 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 ypsetup. Because we are generating maps for an NIS master, we are going to pass the option to ypinit. 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."> + +HP and Hewlett-Packard are trademarks of + Hewlett-Packard Development Company, L.P."> +Hewlett-Packard"> +HP-UX"> +Compaq"> +Tru64"> + 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."> >Release-Note: >Audit-Trail: >Unformatted: