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

[A.M. Kuchling]

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

Modified Files:
	pep-0241.txt 
Log Message:
Fix outdated use of METADATA name (noted by Sean R.)
Expand list of licensing terms using CTAN's list, and explain how to
    derive the 'freely redistributable' status from them (Carey Evans)


Index: pep-0241.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0241.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pep-0241.txt	2001/03/15 18:16:43	1.3
--- pep-0241.txt	2001/03/17 16:01:48	1.4
***************
*** 23,30 ****
      go).
  
!     Developers may not provide their own "METADATA" file.  The "sdist"
!     command will, if it detects an existing "METADATA" file, terminate
      with an appropriate error message.  This should prevent confusion
!     caused by the "METADATA" and "setup.py" files being out of sync.
  
      The PKG-INFO file format is a single set of RFC-822 headers
--- 23,30 ----
      go).
  
!     Developers may not provide their own "PKG-INFO" file.  The "sdist"
!     command will, if it detects an existing "PKG-INFO" file, terminate
      with an appropriate error message.  This should prevent confusion
!     caused by the "PKG-INFO" and "setup.py" files being out of sync.
  
      The PKG-INFO file format is a single set of RFC-822 headers
***************
*** 138,144 ****
        The choices are:
  
!         Artistic, BSD, GPL, LGPL, "MIT/X11", MPL, "public domain",
!         Python, QPL, ZPL, other 
! 
  
  Copyright
--- 138,166 ----
        The choices are:
  
!         Artistic, BSD, DFSG, GNU PL, Lesser GNU PL, "MIT/X11", 
!         Mozilla PL, "public domain", Python, Qt PL, Zope PL, unknown,
!         nocommercial, nosell, nosource, shareware, other
! 
!       The definitions are:
!        public domain  Software is public domain, not copyrighted.
!        unknown        Status is not known 
!        nocommercial   Free private use but commercial use not permitted 
!        nosell         Free use but distribution for profit by arrangement 
!        nosource       Freely distributable but no source code 
!        shareware      Payment is requested if software is used
!        other          General category for other non-DFSG licenses 
! 
!       Some of these licenses can be interpreted to mean the software is 
!       freely redistributable.  The list of redistributable licenses is:
! 
!       Artistic, BSD, DFSG, GNU PL, Lesser GNU PL, "MIT/X11", 
!       Mozilla PL, "public domain", Python, Qt PL, Zope PL, 
!       nosource, shareware
! 
! 
!       Note that being redistributable does not mean a package
!       qualifies as free software, 'nosource' and 'shareware' being
!       examples.
!       
  
  Copyright