[Python-checkins] r51775 - sandbox/trunk/Doc/2.5-pr.txt

[andrew.kuchling]

Author: andrew.kuchling
Date: Wed Sep  6 20:05:13 2006
New Revision: 51775

Modified:
   sandbox/trunk/Doc/2.5-pr.txt
Log:
Had some time to kill, so filled in the trademark section

Modified: sandbox/trunk/Doc/2.5-pr.txt
==============================================================================
--- sandbox/trunk/Doc/2.5-pr.txt	(original)
+++ sandbox/trunk/Doc/2.5-pr.txt	Wed Sep  6 20:05:13 2006
@@ -6,7 +6,7 @@
 New release enhances powerful programming language
 
 **XXX, September 12, 2006** -- The Python Software Foundation (PSF)
-announces the release of version 2.5 of the Python programming
+announces the release of version 2.5 of the Python(R) programming
 language.  XXX write summary sentence
 
 XXX describe improvements.   Get quote from Guido.
@@ -57,10 +57,10 @@
 
  * Unit testing, profiling, and documentation generation.
 
- * Available third party modules for database access, mathematics, 3D modeling,
-   image processing, LDAP, WebDAV, Jabber, MIDI, and much more.
+ * Third party modules are available for database access, mathematics, 3D modeling,
+   image processing, LDAP, WebDAV, Jabber(R), MIDI, and many more applications.
 
-Python runs on Microsoft Windows, Mac OS X, Linux, Unix, and many
+Python runs on Microsoft Windows(R), Mac OS(R) X, Linux(R), UNIX(R), and many
 other operating systems. Full source code is available for the
 language and associated standard libraries under an open-source license.
 
@@ -77,11 +77,25 @@
 www.python.org/psf. 
 
 To make a tax-deductible donation, please visit
-www.python.org/psf/donations/.  Corporate sponsorships are also being
-accepted.
+www.python.org/psf/donations/.  Corporate sponsorships are also available.
 
 
 Legal
 -----
 
-XXX trademark declarations for Windows, others
\ No newline at end of file
+Python and the Python logo are trademarks or registered trademarks of
+the Python Software Foundation.
+
+Jabber is a registered trademark of Jabber Inc., and its use is
+licensed through the Jabber Software Foundation.
+
+Windows is a registered trademark of Microsoft Corporation in the
+United States and other countries.
+
+Mac OS is a trademark of Apple Computer, Inc., registered in the US
+and other countries.
+
+Linux(R) is the registered trademark of Linus Torvalds in the U.S. and
+other countries.
+
+UNIX is a registered trademark of The Open Group.