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

[Barry Warsaw]

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

Modified Files:
	pep-0101.txt 
Log Message:
Just a few more minor updates based on the 2.2b2 release.


Index: pep-0101.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0101.txt,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** pep-0101.txt	2001/10/29 15:53:04	1.14
--- pep-0101.txt	2001/11/16 21:30:25	1.15
***************
*** 148,151 ****
--- 148,160 ----
        about changes on the Mac.
  
+       This command should help you:
+ 
+       % cvs log -rr22a2: | python Tools/scripts/logmerge.py > /tmp/news.txt
+ 
+       You can then troll through the news.txt file looking for
+       interesting things to add to NEWS.
+ 
+   ___ Check your NEWS changes into the branch and into the trunk.
+ 
    ___ Once the branch is frozen, Fred Drake needs to create the HTML
        from the documentation.  He does this and uploads the file to
***************
*** 164,168 ****
    ___ Tim Peters grabs the HTML and uses this to build the Windows
        installer.  Tim then creates a new "release" named X.YaZ on the
!       SourceForge file release manager.
  
        (Diversion: SF's file manager has "packages" and "releases".  We
--- 173,178 ----
    ___ Tim Peters grabs the HTML and uses this to build the Windows
        installer.  Tim then creates a new "release" named X.YaZ on the
!       SourceForge file release manager.  (Although, if you get there
!       first, you should create the new release.)
  
        (Diversion: SF's file manager has "packages" and "releases".  We
***************
*** 453,460 ****
      ___ Run a diff against your branch by doing this in the common
          parent directory containing both python-clean and python-XYaZ:
!         % diff -r python-clean python-22a2 | grep ^diff | grep -v CVS
! 
!     ___ Take the output of this and stick it in a file,
!         e.g. /tmp/diffcmd.sh
  
      ___ Edit diffcmd.sh to get rid of files that you know don't have
--- 463,468 ----
      ___ Run a diff against your branch by doing this in the common
          parent directory containing both python-clean and python-XYaZ:
!         % diff -r python-clean python-22a2 | grep ^diff | grep -v CVS \
!             > /tmp/diffcmd.sh
  
      ___ Edit diffcmd.sh to get rid of files that you know don't have