[Python-checkins] CVS: python/nondist/peps pep-0101.txt,1.1,1.2

2001年8月23日 15:35:34 -0700

Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv15992
Modified Files:
	pep-0101.txt 
Log Message:
Typos, spell check, untab
Index: pep-0101.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0101.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pep-0101.txt	2001年08月22日 22:41:40	1.1
--- pep-0101.txt	2001年08月23日 22:35:32	1.2
***************
*** 50,54 ****
 the release, the RM will create a branch for this release. Only
 the RM is authorized to make commits to this branch, but
! checkins can proceed as normal on the trunk. It is the
 responsibility of the RM to decide on a case-by-case basis which
 trunk modifications should be merged into the branch.
--- 50,54 ----
 the release, the RM will create a branch for this release. Only
 the RM is authorized to make commits to this branch, but
! check ins can proceed as normal on the trunk. It is the
 responsibility of the RM to decide on a case-by-case basis which
 trunk modifications should be merged into the branch.
***************
*** 72,76 ****
 change should also be applied to the branch.

! If so, it's fairly easy to apply the change by diffing the file
 and patching it manually. You can also sometimes get away with
 just copying the file from the trunk directory to the branch
--- 72,76 ----
 change should also be applied to the branch.

! If so, it's fairly easy to apply the change by diff'ing the file
 and patching it manually. You can also sometimes get away with
 just copying the file from the trunk directory to the branch
***************
*** 90,94 ****
 about changes on the Mac.

! - Also the night before the release, a freeze is put on checkins
 into the branch. At this point, nobody except Fred Drake or Tim
 Peters should make any commits to the branch. If the RM screwed
--- 90,94 ----
 about changes on the Mac.

! - Also the night before the release, a freeze is put on check ins
 into the branch. At this point, nobody except Fred Drake or Tim
 Peters should make any commits to the branch. If the RM screwed
***************
*** 180,187 ****
 - Start your upload to SF. You need to get Python-2.2a3.tgz into
 SourceForge. This can take a while both because of the time it
! takes to upload 650+KB of data, /and/ because SF has a 30 minute
! delay built into the file release process. The next few steps
! can be taken in parallel, so it's best to start the upload now
! and keep an eye on its progress.

 I've found that the `ncftpput' program is a great tool to use if
--- 180,187 ----
 - Start your upload to SF. You need to get Python-2.2a3.tgz into
 SourceForge. This can take a while both because of the time it
! takes to upload such a huge file, /and/ because SF has a 30
! minute delay built into the file release process. The next few
! steps can be taken in parallel, so it's best to start the upload
! now and keep an eye on its progress.

 I've found that the `ncftpput' program is a great tool to use if
***************
*** 415,419 ****
 development. E.g. the line should look like:

! #define PY_VERSION		"2.2a2+"

 Commit this change.
--- 415,419 ----
 development. E.g. the line should look like:

! #define PY_VERSION "2.2a2+"

 Commit this change.