# HG changeset patch # User Guido van Rossum <guido@python.org> # Date 967987298 0 # Sun Sep 03 13:21:38 2000 +0000 # Node ID 9553a375edb59bdac6bf8849bf1d37a868e7a326 # Parent f0ee25b44ca4257e8b9cec175d8ea62a0e826234 Properly name and number the BEOPEN OPEN SOURCE PYTHON LICENSE AGREEMENT VERSION 1. trade name -> trade names. Note: depending on community feedback, we may end up taking the dual licensing clause out for 2.0b1, and put it back into 2.0final, if there's no other solution for assuring GPL compatibility by then. See my message to python-dev and license-py20. diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -19,10 +19,8 @@ BEOPEN.COM TERMS AND CONDITIONS FOR PYTHON 2.0 ============================================== -BEOPEN PYTHON LICENSE AGREEMENT -------------------------------- - -BEOPEN OPEN SOURCE LICENSE AGREEMENT +BEOPEN OPEN SOURCE PYTHON LICENSE AGREEMENT VERSION 1 +----------------------------------------------------- 1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the @@ -64,9 +62,9 @@ law provisions. Nothing in this License Agreement shall be deemed to create any relationship of agency, partnership, or joint venture between BeOpen and Licensee. This License Agreement does not grant -permission to use BeOpen trademarks or trade name in a trademark sense -to endorse or promote products or services of Licensee, or any third -party. As an exception, the "BeOpen Python" logos available at +permission to use BeOpen trademarks or trade names in a trademark +sense to endorse or promote products or services of Licensee, or any +third party. As an exception, the "BeOpen Python" logos available at http://www.pythonlabs.com/logos.html may be used according to the permissions granted on that web page.