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

[Fred L. Drake]

Update of /cvsroot/python/python/nondist/peps
In directory slayer.i.sourceforge.net:/tmp/cvs-serv27282

Modified Files:
	pep-0160.txt 
Log Message:

Identify the branch tag for the Python 1.6 release.
Remove the ugly form-feed characters some people use with Emacs.


Index: pep-0160.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0160.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pep-0160.txt	2000/07/25 20:48:58	1.3
--- pep-0160.txt	2000/07/27 18:46:29	1.4
***************
*** 6,10 ****
  Status:         Incomplete
  
- 
  Introduction
  
--- 6,9 ----
***************
*** 16,25 ****
      Corporation for National Research Initiatives (CNRI).
  
- 
  Schedule
      August 1     1.6 beta 1 release.
      August 15    1.6 final release.
  
- 
  Features
  
--- 15,22 ----
***************
*** 37,41 ****
        of the re module.
  
- 
  Mechanism
  
--- 34,37 ----
***************
*** 47,59 ****
      implementations.
  
      Patches and features will be merged to the extent required to pass
      regression tests in effect on 16 May 2000.
  
- 
  Copyright
  
      This document has been placed in the public domain.
  
- 
  Local Variables:
  mode: indented-text
--- 43,55 ----
      implementations.
  
+     The branch tag is "cnri-16-start".
+ 
      Patches and features will be merged to the extent required to pass
      regression tests in effect on 16 May 2000.
  
  Copyright
  
      This document has been placed in the public domain.
  
  Local Variables:
  mode: indented-text