[Python-checkins] CVS: python/nondist/peps pep-0241.txt,1.9,1.10

A.M. Kuchling akuchling@users.sourceforge.net
Fri, 10 Aug 2001 11:34:45 -0700


Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv30535

Modified Files:
	pep-0241.txt 
Log Message:
Refer to just the MIT license, not the MIT/X11 license


Index: pep-0241.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0241.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** pep-0241.txt	2001/07/09 03:57:09	1.9
--- pep-0241.txt	2001/08/10 18:34:43	1.10
***************
*** 174,178 ****
        The choices are:
  
!         Artistic, BSD, DFSG, GNU GPL, GNU LGPL, "MIT/X11", 
          Mozilla PL, "public domain", Python, Qt PL, Zope PL, unknown,
          nocommercial, nosell, nosource, shareware, other
--- 174,178 ----
        The choices are:
  
!         Artistic, BSD, DFSG, GNU GPL, GNU LGPL, "MIT", 
          Mozilla PL, "public domain", Python, Qt PL, Zope PL, unknown,
          nocommercial, nosell, nosource, shareware, other
***************
*** 187,191 ****
  
         Python         Python 1.6 or higher license.  Version 1.5.2 and 
!                       earlier are under the MIT/X11 license.
  
         public domain  Software is public domain, not copyrighted.
--- 187,191 ----
  
         Python         Python 1.6 or higher license.  Version 1.5.2 and 
!                       earlier are under the MIT license.
  
         public domain  Software is public domain, not copyrighted.
***************
*** 200,204 ****
        freely redistributable.  The list of redistributable licenses is:
  
!       Artistic, BSD, DFSG, GNU GPL, GNU LGPL, "MIT/X11", 
        Mozilla PL, "public domain", Python, Qt PL, Zope PL, 
        nosource, shareware
--- 200,204 ----
        freely redistributable.  The list of redistributable licenses is:
  
!       Artistic, BSD, DFSG, GNU GPL, GNU LGPL, "MIT", 
        Mozilla PL, "public domain", Python, Qt PL, Zope PL, 
        nosource, shareware
***************
*** 210,214 ****
        Example: 
  
!           License: MIT/X11
        
  
--- 210,214 ----
        Example: 
  
!           License: MIT