[Python-checkins] CVS: python/nondist/peps pep-0241.txt,1.7,1.8
A.M. Kuchling
akuchling@users.sourceforge.net
2001年3月20日 07:48:12 -0800
Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv8766
Modified Files:
pep-0241.txt
Log Message:
Reformat examples. Make the 'Description' example clearer.
Add 'Acknowledgements' section
Index: pep-0241.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0241.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** pep-0241.txt 2001年03月19日 22:29:15 1.7
--- pep-0241.txt 2001年03月20日 15:48:10 1.8
***************
*** 52,62 ****
legal value here.
! Example: 'Metadata-Version: 1.0'
Name
The name of the package.
! Example: 'Name: BeagleVote'
Version
--- 52,66 ----
legal value here.
! Example:
+ Metadata-Version: 1.0
+
Name
The name of the package.
+
+ Example:
! Name: BeagleVote
Version
***************
*** 66,71 ****
(StrictVersion or LooseVersion) in the distutils.version
module.
! Example: 'Version: 1.0a2'
Platform (multiple use)
--- 70,77 ----
(StrictVersion or LooseVersion) in the distutils.version
module.
+
+ Example:
! Version: 1.0a2
Platform (multiple use)
***************
*** 83,93 ****
are not specified in this PEP.
! Example: 'Platform: POSIX, Windows'
Summary
A one-line summary of what the package does.
! Example: "Summary: A module for collecting votes from beagles."
Description (optional)
--- 89,103 ----
are not specified in this PEP.
! Example:
!
! Platform: POSIX, Windows
Summary
A one-line summary of what the package does.
+
+ Example:
! Summary: A module for collecting votes from beagles.
Description (optional)
***************
*** 99,113 ****
long-description.)
! Example: "Description: This module collects votes from beagles\n
! in order to determine their electoral wishes.\n
! Do NOT try to use this module with basset hounds;
! it makes them grumpy."
Keywords (optional)
A list of additional keywords to be used to assist searching
for the package in a larger catalog.
! Example: 'Keywords: dog puppy voting election'
Home-page (optional)
--- 109,127 ----
long-description.)
! Example:
+ Description: This module collects votes from beagles
+ in order to determine their electoral wishes.
+ Do NOT try to use this module with basset hounds;
+ it makes them grumpy.
+
Keywords (optional)
A list of additional keywords to be used to assist searching
for the package in a larger catalog.
+
+ Example:
! Keywords: dog puppy voting election
Home-page (optional)
***************
*** 115,119 ****
A string containing the URL for the package's home page.
! Example: 'Home-page: http://www.example.com/~cschultz/bvote/'
Author (optional)
--- 129,135 ----
A string containing the URL for the package's home page.
! Example:
!
! Home-page: http://www.example.com/~cschultz/bvote/
Author (optional)
***************
*** 122,129 ****
information can also be added, separating each line with
newlines.
! Example: 'Author: C. Schultz
! Universal Features Syndicate
! Los Angeles, CA'
Author-email
--- 138,147 ----
information can also be added, separating each line with
newlines.
+
+ Example:
! Author: C. Schultz
! Universal Features Syndicate
! Los Angeles, CA
Author-email
***************
*** 140,144 ****
PEP.
! Example: 'Author-email: "C. Schultz" <cschultz@example.com>'
License
--- 158,164 ----
PEP.
! Example:
!
! Author-email: "C. Schultz" <cschultz@example.com>
License
***************
*** 154,164 ****
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:
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.
unknown Status is not known
--- 174,192 ----
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
+
+ Definitions of some of the licenses are:
! DFSG The license conforms to the Debian Free Software
! Guidelines, but does not use one of the other
! DFSG conforming licenses listed here.
! More information is available at:
! http://www.debian.org/social_contract#guidelines
!
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.
unknown Status is not known
***************
*** 172,176 ****
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
--- 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
***************
*** 180,185 ****
examples.
! Example: 'License: MIT/X11'
Copyright
--- 208,226 ----
examples.
! Example:
!
! License: MIT/X11
+
+ Acknowledgements
+
+ Many changes and rewrites to this document were suggested by the
+ readers of the Distutils SIG. In particular, Sean Reifschneider
+ often contributed actual text for inclusion in this PEP.
+
+ The list of licenses was compiled using the SourceForge license
+ list and the CTAN license list compiled by Graham Williams; Carey
+ Evans also offered several useful suggestions on this list.
+
Copyright