Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 24 May 2010 14:23:45 +0200
From:      Marius Strobl <marius@alchemy.franken.de>
To:        "Simon L. Nielsen" <simon@FreeBSD.org>
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
Message-ID:  <20100524122345.GI68288@alchemy.franken.de>
In-Reply-To: <20100524113941.GA1396@arthur.nitro.dk>
References:  <201005231946.o4NJkJLL072302@svn.freebsd.org> <20100524113941.GA1396@arthur.nitro.dk>
next in thread | previous in thread | raw e-mail | index | archive | help 

--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.
> 
> >  	<listitem>
> > -	  <para>&netra; t1 105</para>
> > +	  <para>&sun; &netra; t1 100/105</para>
> 
> 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.)
> 
> > +      <para>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:</para>
> 
> 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 @@
       <title>sparc64</title>
 
       <para>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
 	<ulink url="http://sunsolve.sun.com/handbook_pub/">Sun System
@@ -391,8 +391,8 @@
 
       <para>When using the <filename>GENERIC</filename> 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.</para>
@@ -451,55 +451,55 @@
 	</listitem>
 
 	<listitem>
-	  <para>&sun; &netra; t1 100/105</para>
+	  <para>Sun &netra; t1 100/105</para>
 	</listitem>
 
 	<listitem>
-	  <para>&sun; &netra; T1 AC200/DC200</para>
+	  <para>Sun &netra; T1 AC200/DC200</para>
 	</listitem>
 
 	<listitem>
-	  <para>&sun; &netra; t 1100</para>
+	  <para>Sun &netra; t 1100</para>
 	</listitem>
 
 	<listitem>
-	  <para>&sun; &netra; t 1120</para>
+	  <para>Sun &netra; t 1120</para>
 	</listitem>
 
 	<listitem>
-	  <para>&sun; &netra; t 1125</para>
+	  <para>Sun &netra; t 1125</para>
 	</listitem>
 
 	<listitem>
-	  <para>&sun; &netra; t 1400/1405</para>
+	  <para>Sun &netra; t 1400/1405</para>
 	</listitem>
 
 	<listitem>
-	  <para>&sun; &netra; 120</para>
+	  <para>Sun &netra; 120</para>
 	</listitem>
 
 	<listitem>
-	  <para>&sun; &netra; X1</para>
+	  <para>Sun &netra; X1</para>
 	</listitem>
 
 	<listitem>
-	  <para>&sun; &sparcengine; Ultra AX1105</para>
+	  <para>Sun &sparcengine; Ultra AX1105</para>
 	</listitem>
 
 	<listitem>
-	  <para>&sun; &sparcengine; Ultra AXe</para>
+	  <para>Sun &sparcengine; Ultra AXe</para>
 	</listitem>
 
 	<listitem>
-	  <para>&sun; &sparcengine; Ultra AXi</para>
+	  <para>Sun &sparcengine; Ultra AXi</para>
 	</listitem>
 
 	<listitem>
-	  <para>&sun; &sparcengine; Ultra AXmp</para>
+	  <para>Sun &sparcengine; Ultra AXmp</para>
 	</listitem>
 
 	<listitem>
-	  <para>&sun; &sparcengine; CP1500</para>
+	  <para>Sun &sparcengine; CP1500</para>
 	</listitem>
 
 	<listitem>
@@ -542,8 +542,8 @@
       <para>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).</para>
+	supported by the &man.esp.4 driver (Sun ESP SCSI, Sun FAS Fast-SCSI
+	and Sun FAS366 Fast-Wide SCSI controllers).</para>
 
       <itemizedlist>
 	<listitem>
@@ -555,7 +555,7 @@
 	</listitem>
       </itemizedlist>
 
-      <para>Starting with 7.2-RELEASE, &arch.sparc64; systems based on &sun;
+      <para>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:</para>
 
@@ -616,7 +616,7 @@
 	</listitem>
       </itemizedlist>
 
-      <para>The following &sun; &ultrasparc; systems are not tested but
+      <para>The following Sun &ultrasparc; systems are not tested but
 	believed to be also supported by &os;:</para>
 
       <itemizedlist>
@@ -639,29 +639,29 @@
       </itemizedlist>
 
       <para>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:</para>
 
       <itemizedlist>
 	<listitem>
-	  <para>&fujitsu; &primepower; 250</para>
+	  <para>Fujitsu &primepower; 250</para>
 	</listitem>
       </itemizedlist>
 
-      <para>The following &fujitsu; &primepower; systems are not tested but
+      <para>The following Fujitsu &primepower; systems are not tested but
 	believed to be also supported by &os;:</para>
 
       <itemizedlist>
 	<listitem>
-	  <para>&fujitsu; &primepower; 450</para>
+	  <para>Fujitsu &primepower; 450</para>
 	</listitem>
 
 	<listitem>
-	  <para>&fujitsu; &primepower; 650</para>
+	  <para>Fujitsu &primepower; 650</para>
 	</listitem>
 
 	<listitem>
-	  <para>&fujitsu; &primepower; 850</para>
+	  <para>Fujitsu &primepower; 850</para>
 	</listitem>
       </itemizedlist>
 

--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 @@
 
   <h3><a name="intro">Introduction</a></h3>
 
-  <p>This page contains information about the FreeBSD port to Fujitsu&reg;'s
+  <p>This page contains information about the FreeBSD port to Fujitsu's
     SPARC64&reg; and Sun Microsystem's UltraSPARC&reg; architectures.
     Discussion of this port takes
     place on the

--5/uDoXvLw7AC5HRs--

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100524122345.GI68288>