From e87d1ea86537ac4d78624546eb43d393c3afff71 Mon Sep 17 00:00:00 2001 From: "Simon L. B. Nielsen" Date: Fri, 10 Oct 2003 23:27:19 +0000 Subject: [PATCH] - Sort by company name. - Indent consistently. --- en/copyright/trademarks.sgml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/en/copyright/trademarks.sgml b/en/copyright/trademarks.sgml index 622b4f056b..565db94f21 100644 --- a/en/copyright/trademarks.sgml +++ b/en/copyright/trademarks.sgml @@ -1,6 +1,6 @@ - + %includes; ]> @@ -11,28 +11,19 @@

FreeBSD is a registered trademark of Wind River Systems, Inc. This is expected to change soon.

-

Motif, OSF/1, and UNIX are registered trademarks and IT DialTone - and The Open Group are trademarks of The Open Group in the United - States and other countries.

- -

Sun, Sun Microsystems, SunOS, Solaris, and Java are trademarks or - registered trademarks of Sun Microsystems, Inc. in the United States - and other countries.

- -

Sparc, Sparc64, SPARCEngine, and UltraSPARC are trademarks of SPARC - International, Inc in the United States and other countries. - Products bearing SPARC trademarks are based upon architecture - developed by Sun Microsystems, Inc.

+

Adobe, Acrobat, Acrobat Reader, and PostScript are either + registered trademarks or trademarks of Adobe Systems Incorporated in + the United States and/or other countries.

IBM and PowerPC are trademarks of International Business Machines Corporation in the United States, other countries, or both.

-

Adobe, Acrobat, Acrobat Reader, and PostScript are either - registered trademarks or trademarks of Adobe Systems Incorporated in - the United States and/or other countries.

-

IEEE, POSIX, and 802 are registered trademarks of The Institute of - Electrical and Electronics Engineers, Inc.

+ Electrical and Electronics Engineers, Inc.

+ +

Motif, OSF/1, and UNIX are registered trademarks and IT DialTone + and The Open Group are trademarks of The Open Group in the United + States and other countries.

MySQL is a registered trademark of MySQL AB in the United States, the European Union and other countries.

@@ -41,6 +32,15 @@ Silicon Graphics, Inc., in the United States and/or other countries worldwide.

+

Sparc, Sparc64, SPARCEngine, and UltraSPARC are trademarks of SPARC + International, Inc in the United States and other countries. + Products bearing SPARC trademarks are based upon architecture + developed by Sun Microsystems, Inc.

+ +

Sun, Sun Microsystems, SunOS, Solaris, and Java are trademarks or + registered trademarks of Sun Microsystems, Inc. in the United States + and other countries.

+

Many of the designations used by manufacturers and sellers to distinguish their products are claimed as trademarks. Where those designations appear on this website, and the FreeBSD Project was aware