--- a/doc/sgml/user-guide/ChangeLog
+++ b/doc/sgml/user-guide/ChangeLog
@@ -1,5 +1,7 @@
 2003-07-09  Jonathan Larmour  <jifl@eCosCentric.com>
 
+	* user-guide.sgml: Update trademark info and sort.
+
 	* real-time-characterization.sgml: real-time characterization is
 	discussed in ref manual, not user guide.
 

--- a/doc/sgml/user-guide/user-guide.sgml
+++ b/doc/sgml/user-guide/user-guide.sgml
@@ -91,29 +91,33 @@ permission is obtained from the copyrigh
     </legalnotice>
     <legalnotice>
       <title>Trademarks</title>
-      <para>Red Hat, the Red Hat Shadow Man logo&reg;, eCos&trade;, RedBoot&trade;,
-GNUPro&reg;, and Insight&trade; are trademarks of Red Hat, Inc. </para>
-<para>Sun Microsystems&reg; and Solaris&reg; are registered trademarks of
-Sun Microsystems, Inc. </para>
-<para>SPARC&reg; is a registered trademark of SPARC International, Inc., and
-is used under license by Sun Microsystems, Inc. </para>
-<para>Intel&reg; is a registered trademark of Intel Corporation.</para>
-<para>Motorola&trade; is a trademark of Motorola, Inc.</para>
-<para>ARM&reg; is a registered trademark of Advanced RISC Machines, Ltd.</para>
-<para>MIPS&trade; is a trademark of MIPS Technologies, Inc.</para>
+<para>Altera&reg; and Excalibur&trade; are trademarks of Altera Corporation.</para>
+<para>AMD&reg; is a registered trademark of Advanced Micro Devices, Inc.</para>
+<para>ARM&reg;, StrongARM&reg;, Thumb&reg;, ARM7&trade;, ARM9&trade;  is a registered trademark of Advanced RISC Machines, Ltd.</para>
+<para>Cirrus Logic&reg; and Maverick&trade; are registered trademarks of Cirrus Logic, Inc.</para>
+<para>Cogent&trade; is a trademark of Cogent Computer Systems, Inc.</para>
+<para>Compaq&reg; is a registered trademark of the Compaq Computer Corporation.</para>
+<para>Fujitsu&reg; is a registered trademark of Fujitsu Limited.</para>
+<para>IBM&reg;, and PowerPC&trade; are trademarks of International Business Machines Corporation.</para>
+<para>IDT&reg; is a registered trademark of Integrated Device Technology Inc.</para>
+<para>Intel&reg;, i386&trade;, Pentium&reg;, StrataFlash&reg; and XScale&trade; are trademarks of Intel Corporation.</para>
+<para>Intrinsyc&reg; and Cerf&trade; are trademarks of Intrinsyc Software, Inc.</para>
+<para>Linux&reg; is a registered trademark of Linus Torvalds. </para>
+<para>Matsushita&trade; and Panasonic&reg; are trademarks of the Matsushita Electric Industrial Corporation.</para>
+<para>Microsoft&reg;, Windows&reg;, Windows NT&reg; and Windows XP&reg; are registered trademarks of Microsoft Corporation, Inc. </para>
+<para>MIPS&reg;, MIPS32&trade; MIPS64&trade;, 4K&trade, 5K&trade; Atlas&trade; and Malta&trade; are trademarks of MIPS Technologies, Inc.</para>
+<para>Motorola&reg;, ColdFire&reg; is a trademark of Motorola, Inc.</para>
+<para>NEC&reg; V800&trade;, V850&trade;, V850/SA1&trade;, V850/SB1&trade;, VR4300&trade;, and VRC4375&trade; are trademarks of NEC Corporation.</para>
+<para>PMC-Sierra&reg; RM7000&trade; and Ocelot&trade; are trademarks of PMC-Sierra Incorporated. </para>
+<para>Red Hat, eCos&trade;, RedBoot&trade;, GNUPro&reg;, and Insight&trade; are trademarks of Red Hat, Inc. </para>
+<para>Samsung&reg; and CalmRISC&trade; are trademarks or registered trademarks of Samsung, Inc. </para>
+<para>Sharp&reg; is a registered trademark of Sharp Electronics Corp.</para>
+<para>SPARC&reg; is a registered trademark of SPARC International, Inc., and is used under license by Sun Microsystems, Inc. </para>
+<para>Sun Microsystems&reg; and Solaris&reg; are registered trademarks of Sun Microsystems, Inc. </para>
+<para>SuperH&trade; and Renesas&trade; are trademarks owned by Renesas Technology Corp.</para>
+<para>Texas Instruments&reg;, OMAP&trade; and Innovator&trade; are trademarks of Texas Instruments Incorporated.</para>
 <para>Toshiba&reg; is a registered trademark of the Toshiba Corporation.</para>
-<para>NEC&reg; is a registered trademark if the NEC Corporation.</para>
-<para>Cirrus Logic&reg; is a registered trademark of Cirrus Logic, Inc.</para>
-<para>Compaq&reg; is a registered trademark of the Compaq Computer Corporation.
-</para>
-<para>Matsushita&trade; is a trademark of the Matsushita Electric Corporation.
-</para>
-<para>Samsung&reg; and CalmRISC&trade; are trademarks or registered trademarks
-of Samsung, Inc. </para>
-<para>Linux&reg; is a registered trademark of Linus Torvalds. </para>
 <para>UNIX&reg; is a registered trademark of The Open Group. </para>
-<para>Microsoft&reg;, Windows&reg;, and Windows NT&reg; are registered trademarks
-of Microsoft Corporation, Inc. </para>
 <para>All other brand and product names, trademarks, and copyrights are the
 property of their respective owners. </para>
       </legalnotice>