Remove mention of 2.2 plans

Add Download-URL
Remove mention of separating lines in author field

pep-0314.txt

@@ -37,8 +37,7 @@ Including Metadata in Packages
     The PKG-INFO file format is a single set of RFC-822 headers
     parseable by the rfc822.py module.  The field names listed in the
     following section are used as the header names.  There's no 
-    extension mechanism in this simple format; the Catalog and Distutils
-    SIGs will aim at getting a more flexible format ready for Python 2.2.
+    extension mechanism in this simple format.
     
 
 Fields
@@ -97,7 +96,7 @@ Fields
       Example: 
 
           Platform: POSIX, Windows
-      
+
     Summary
 
       A one-line summary of what the package does.
@@ -138,17 +137,21 @@ Fields
 
           Home-page: http://www.example.com/~cschultz/bvote/
       
+    Download-URL
+    
+      A string containing the URL from which this version of the package 
+      can be downloaded.  (This means that the URL can't be something like
+      ".../package-latest.tgz", but instead must be "../package-0.45.tgz".)
+      
     Author (optional)
 
-      A string containing at a minimum the author's name.  Contact
-      information can also be added, separating each line with
-      newlines.
+      A string containing the author's name at a minimum; additional
+      contact information may be provided.  
 
       Example: 
 
-          Author: C. Schultz
-                  Universal Features Syndicate
-                  Los Angeles, CA
+          Author: C. Schultz, Universal Features Syndicate,
+                  Los Angeles, CA <cschultz@peanuts.example.com>
       
     Author-email