From owner-freebsd-doc@FreeBSD.ORG Sun Jan 4 04:21:18 2004 Return-Path: Delivered-To: freebsd-doc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 036DF16A4CF; Sun, 4 Jan 2004 04:21:18 -0800 (PST) Received: from arthur.nitro.dk (port324.ds1-khk.adsl.cybercity.dk [212.242.113.79]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8ADF443D39; Sun, 4 Jan 2004 04:21:16 -0800 (PST) (envelope-from simon@arthur.nitro.dk) Received: by arthur.nitro.dk (Postfix, from userid 3000) id 666D01142B; Sun, 4 Jan 2004 13:21:15 +0100 (CET) Date: Sun, 4 Jan 2004 13:21:14 +0100 From: "Simon L. Nielsen" To: Mario Sergio Fujikawa Ferreira Message-ID: <20040104122108.GA670@arthur.nitro.dk> References: <20031212021612.86072.qmail@exxodus.fedaykin.here> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="azLHFNyN32YCQGCU" Content-Disposition: inline In-Reply-To: <20031212021612.86072.qmail@exxodus.fedaykin.here> User-Agent: Mutt/1.5.5.1i cc: freebsd-doc@FreeBSD.org Subject: Re: en_US.ISO8859-1/share/sgml/trademarks.sgml small fix X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Jan 2004 12:21:18 -0000 --azLHFNyN32YCQGCU Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2003.12.12 00:16:12 -0159, Mario Sergio Fujikawa Ferreira wrote: > Small uniformization. Should we always use a comma > after Inc. or not at all? I know it is minor and I should probably > decide myself but I rather ask then be sorry. > > Attached is a patch that show the change. If the decision > is that a comma should not follow, I'll remove some in the same > file. Sorry about the late reply, I was rather busy in December. In general I have just copy/pasted the trademark attribution from whatever each company had on their website. Therefor I think they should be left as they are, unless somebody with better English grammar skills than me can positively say if the commas should be there or not. > --- en_US.ISO8859-1/share/sgml/trademarks.sgml.orig Thu Dec 11 23:58:50 2= 003 > +++ en_US.ISO8859-1/share/sgml/trademarks.sgml Thu Dec 11 23:59:31 2003 > @@ -13,7 +13,7 @@ > other countries. > =20 > Sun, Sun Microsystems, SunOS, Solaris, and Java are trademarks > - or registered trademarks of Sun Microsystems, Inc. in the United > + or registered trademarks of Sun Microsystems, Inc., in the United > States and other countries. > =20 > > @@ -22,7 +22,7 @@ > registered in the U.S. and other countries. > =20 > Macromedia and Flash are trademarks or registered > - trademarks of Macromedia, Inc. in the United States and/or other > + trademarks of Macromedia, Inc., in the United States and/or other > countries. > =20 > Microsoft, Windows, and Windows Media are either registered --=20 Simon L. Nielsen FreeBSD Documentation Team --azLHFNyN32YCQGCU Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.3 (FreeBSD) iD8DBQE/+AU0h9pcDSc1mlERAk8TAJ9ELlEKXXXAwxPyL3q1G8i2LBYb2gCfTKN0 nQcYtt6SkrMeeFLlmzeqTHA= =xMMd -----END PGP SIGNATURE----- --azLHFNyN32YCQGCU--