Add Obsoletes and Conflicts; wording tweak

pep-0314.txt

@@ -259,7 +259,7 @@ Fields
        
     Provides (multiple use)
 
-      Each entry contains a string describing some other component or
+      Each entry contains a string describing a component or
       module that will be provided by this package once it is
       installed.  These strings should match the ones used in
       Requirements fields.  Version declarations cannot be supplied;
@@ -272,10 +272,42 @@ Fields
           Provides: xml.utils.iso8601
           Provides: xml.dom
 
+    Obsoletes (multiple use)
+
+      Each entry contains a string describing a component or module
+      that this package renders obsolete, meaning that the two packages
+      should not be installed at the same time.  Version declarations
+      cannot be supplied.  (XXX Or are they needed for Obsoletes?)
+
+      The most common use of this field will be in case a package name
+      changes, e.g. Gorgon 2.3 gets subsumed into Torqued Python 1.0.
+      When you install Torqued Python, the Gorgon package should be
+      removed.
+      
+      Example:
+
+          Obsoletes: Gorgon
+
+    Conflicts (multiple use)
+
+      Each entry contains a string describing a component or module
+      that conflicts with this package, meaning that the two packages
+      should not be installed at the same time.  Version declarations
+      cannot be supplied.  
+
+      Conflict resolution probably isn't very important for Python
+      programs, because few extensions will cause problems for other
+      extensions, unless they're using the same package name.  This 
+      field name is being defined here for future use.
+
+          Conflicts: Gorgon
+
+
 Acknowledgements
 
     None yet.        
 
+
 Copyright
 
     This document has been placed in the public domain.