From owner-svn-src-all@FreeBSD.ORG Mon May 24 12:23:47 2010 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 03FD51065679; Mon, 24 May 2010 12:23:47 +0000 (UTC) (envelope-from marius@alchemy.franken.de) Received: from alchemy.franken.de (alchemy.franken.de [194.94.249.214]) by mx1.freebsd.org (Postfix) with ESMTP id 650858FC0A; Mon, 24 May 2010 12:23:46 +0000 (UTC) Received: from alchemy.franken.de (localhost [127.0.0.1]) by alchemy.franken.de (8.14.3/8.14.3/ALCHEMY.FRANKEN.DE) with ESMTP id o4OCNjAF013649; Mon, 24 May 2010 14:23:45 +0200 (CEST) (envelope-from marius@alchemy.franken.de) Received: (from marius@localhost) by alchemy.franken.de (8.14.3/8.14.3/Submit) id o4OCNjZP013648; Mon, 24 May 2010 14:23:45 +0200 (CEST) (envelope-from marius) Date: Mon, 24 May 2010 14:23:45 +0200 From: Marius Strobl To: "Simon L. Nielsen" Message-ID: <20100524122345.GI68288@alchemy.franken.de> References: <201005231946.o4NJkJLL072302@svn.freebsd.org> <20100524113941.GA1396@arthur.nitro.dk> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="5/uDoXvLw7AC5HRs" Content-Disposition: inline In-Reply-To: <20100524113941.GA1396@arthur.nitro.dk> User-Agent: Mutt/1.4.2.3i Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r208459 - head/release/doc/en_US.ISO8859-1/hardware X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 May 2010 12:23:47 -0000 --5/uDoXvLw7AC5HRs Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, May 24, 2010 at 01:39:42PM +0200, Simon L. Nielsen wrote: > On 2010.05.23 19:46:19 +0000, Marius Strobl wrote: > > > New Revision: 208459 > > > > Log: > > Update the sparc64 hardware list regarding machines that will be supported > > beginning with 8.1-RELEASE as well as correct some existing entries and > > add previously missed ones. > > > > > - &netra; t1 105 > > + &sun; &netra; t1 100/105 > > If the product is called Netra and you just added the Sun part to > identify the company it should just be Sun, and not &sun; as you are > refering to Sun the company and not as part of a trademark. > > (It's a bit since I looked at it, but I'm rather sure above ist still > the case.) > > > + Starting with 8.1-RELEASE, &arch.sparc64; systems based on > > + &fujitsu; &sparc64; V are also supported by &os;, which > > + includes the following known working systems: > > Same here, if you are refering to Fujitsu the company it should not > include a trademark symbol. > It's kind of hard to think of a case where one would use the name of a company in a way that doesn't refer to the company but rather to a trademark when even using "company product" doesn't mean to refer to it as part of a trademark :) I.e. when would one have to use the company trademark? In any case, do the attached patches look correct to you? Marius --5/uDoXvLw7AC5HRs Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="article.sgml.diff" Index: article.sgml =================================================================== --- article.sgml (revision 208494) +++ article.sgml (working copy) @@ -380,7 +380,7 @@ sparc64 This section describes the systems currently known to be - supported by &os; on the &fujitsu; &sparc64; and &sun; &ultrasparc; + supported by &os; on the Fujitsu &sparc64; and Sun &ultrasparc; platforms. For background information on the various hardware designs see the Sun System @@ -391,8 +391,8 @@ When using the GENERIC kernel, &os;/&arch.sparc64; systems not equipped with a framebuffer - supported by the &man.creator.4; (&sun; Creator, &sun; Creator3D - and &sun; Elite3D) or &man.machfb.4; (&sun; PGX and &sun; PGX64 + supported by the &man.creator.4; (Sun Creator, Sun Creator3D + and Sun Elite3D) or &man.machfb.4; (Sun PGX and Sun PGX64 as well as the ATI Mach64 chips found onboard in for example &sun.blade; 100, &sun.blade; 150, &sun.ultra; 5 and &sun.ultra; 10) driver must use the serial console. @@ -451,55 +451,55 @@ - &sun; &netra; t1 100/105 + Sun &netra; t1 100/105 - &sun; &netra; T1 AC200/DC200 + Sun &netra; T1 AC200/DC200 - &sun; &netra; t 1100 + Sun &netra; t 1100 - &sun; &netra; t 1120 + Sun &netra; t 1120 - &sun; &netra; t 1125 + Sun &netra; t 1125 - &sun; &netra; t 1400/1405 + Sun &netra; t 1400/1405 - &sun; &netra; 120 + Sun &netra; 120 - &sun; &netra; X1 + Sun &netra; X1 - &sun; &sparcengine; Ultra AX1105 + Sun &sparcengine; Ultra AX1105 - &sun; &sparcengine; Ultra AXe + Sun &sparcengine; Ultra AXe - &sun; &sparcengine; Ultra AXi + Sun &sparcengine; Ultra AXi - &sun; &sparcengine; Ultra AXmp + Sun &sparcengine; Ultra AXmp - &sun; &sparcengine; CP1500 + Sun &sparcengine; CP1500 @@ -542,8 +542,8 @@ The following systems are partially supported by &os;. In particular the fibre channel controllers in SBus-based systems are not supported. However, it is possible to use these with a SCSI controller - supported by the &man.esp.4 driver (&sun; ESP SCSI, &sun; FAS Fast-SCSI - and &sun; FAS366 Fast-Wide SCSI controllers). + supported by the &man.esp.4 driver (Sun ESP SCSI, Sun FAS Fast-SCSI + and Sun FAS366 Fast-Wide SCSI controllers). @@ -555,7 +555,7 @@ - Starting with 7.2-RELEASE, &arch.sparc64; systems based on &sun; + Starting with 7.2-RELEASE, &arch.sparc64; systems based on Sun &ultrasparc; III and beyond are also supported by &os;, which includes the following known working systems: @@ -616,7 +616,7 @@ - The following &sun; &ultrasparc; systems are not tested but + The following Sun &ultrasparc; systems are not tested but believed to be also supported by &os;: @@ -639,29 +639,29 @@ Starting with 8.1-RELEASE, &arch.sparc64; systems based on - &fujitsu; &sparc64; V are also supported by &os;, which + Fujitsu &sparc64; V are also supported by &os;, which includes the following known working systems: - &fujitsu; &primepower; 250 + Fujitsu &primepower; 250 - The following &fujitsu; &primepower; systems are not tested but + The following Fujitsu &primepower; systems are not tested but believed to be also supported by &os;: - &fujitsu; &primepower; 450 + Fujitsu &primepower; 450 - &fujitsu; &primepower; 650 + Fujitsu &primepower; 650 - &fujitsu; &primepower; 850 + Fujitsu &primepower; 850 --5/uDoXvLw7AC5HRs Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="sparc.sgml.diff" Index: sparc.sgml =================================================================== RCS file: /home/dcvs/www/en/platforms/sparc.sgml,v retrieving revision 1.35 diff -u -r1.35 sparc.sgml --- sparc.sgml 23 May 2010 19:59:12 -0000 1.35 +++ sparc.sgml 24 May 2010 12:08:30 -0000 @@ -12,7 +12,7 @@

Introduction

-

This page contains information about the FreeBSD port to Fujitsu®'s +

This page contains information about the FreeBSD port to Fujitsu's SPARC64® and Sun Microsystem's UltraSPARC® architectures. Discussion of this port takes place on the --5/uDoXvLw7AC5HRs--