bugfixes and more cleanup

README.md

@@ -55,7 +55,7 @@ this larger namespace.
 
    All attributes are required.
 
-- **\<podcast:locked>**[yes|no]**\</podcast:locked>**
+- **\<podcast:locked>**[yes or no]**\</podcast:locked>**
 
    Channel
 
@@ -110,7 +110,7 @@ this larger namespace.
    All attributes are required.
 
 
-- **\<podcast:alternateEnclosure type="[mime type]" length="[(int)]" bitrate="[(float)]" title="[(string)]" [stream]>**[uri of media asset]**\</podcast:alternateEnclosure>**
+- **\<podcast:alternateEnclosure type="[mime type]" length="[(int)]" bitrate="[(float)]" title="[(string)]" stream>**[uri of media asset]**\</podcast:alternateEnclosure>**
 
    Channel (optional | single)
 
@@ -160,11 +160,11 @@ this larger namespace.
    All attributes are required.
 
 
-- **\<podcast:category>**[Category Name]**\</podcast:category>**
+- **\<podcast:category>**[category Name]**\</podcast:category>**
 
    Channel
 
-   (optional|single)
+   (optional | multiple)
 
    See "Categories" in this document for an explanation.  There can be up to a total of 9 categories defined.
 
@@ -186,7 +186,7 @@ this larger namespace.
 
    (optional | multiple)
 
-   It identifies a host of a podcast episode or entire podcast.
+   It identifies a host of a podcast episode if in the Item, or an entire podcast if in the Channel.
 
    All attributes are optional but recommended for disambiguation and good meta-data for apps.
 
@@ -224,31 +224,43 @@ this larger namespace.
 
 ### Phase 2 (Open)
 
-- **\<podcast:social platform="[service slug]" url="[link to social media account]">**[social media handle]**\</podcast:social>** (optional|multiple) - This is a channel-level
-   element listing possibly multiple social media accounts for this podcast.  The service slugs should be community written in the accompanying serviceslugs.txt file.
+- **\<podcast:social platform="[service slug]" url="[link to social media account]">**[social media handle]**\</podcast:social>**
 
-- **\<podcast:funding platform="[service slug]" url="[url for the show at the platform]">**[podcast handle at the platform]**\</podcast:funding>** - (optional|multiple) - This is a
-   channel-level element listing multiple possible donation/funding links for the podcast.
+   Channel or Item
+
+   (optional | multiple)
+
+   This element lists social media accounts for this podcast.  The service slugs should be community written into the accompanying serviceslugs.txt file.
+
+
+- **\<podcast:funding platform="[service slug]" url="[url for the show at the platform]">**[podcast handle at the platform]**\</podcast:funding>**
+
+   Channel or Item
+
+   (optional | multiple)
+
+   This element lists multiple possible donation/funding links for the podcast.
 
 
 ## Categories
 
 There can be a maximum of 9 category elements defined in a feed.  Any number greater than that should be discarded.
 
-Category names are defined in the accompanying "categories.json" file
-in this repository.  They should be referenced in the element by their textual name.  The characters can be in any case.  This list of categories aims to replicate the current
-standard but also eliminate as much as possible compound, heirarchical naming and the use of ampersands.  Thus, "Health & Fitness" becomes "Health" and "Fitness" as two distinct categories.
-And, "Religion & Spirituality" becomes two separate categories.  Again, they are different things that don't always go together.  Splitting them allows for more flexible combinations.  And,
-avoiding ampersands makes xml encoding errors less likely.
+Category names are defined in the accompanying "categories.json" file in this repository.  They should be referenced in the element by their textual name.
+The characters can be in any case.  This list of categories aims to replicate the current standard but also eliminate as much as possible compound, heirarchical
+naming and the use of ampersands.  Thus, "Health & Fitness" becomes "Health" and "Fitness" as two distinct categories.  And, "Religion & Spirituality" becomes
+two separate categories.  Again, they are different things that don't always go together.  Splitting them allows for more flexible combinations.  And, avoiding
+ampersands makes xml encoding errors less likely.
 
 
 
 ## Verification, importing and moving
 
-If the "locked" element is present and set to "yes", podcasting hosts and platforms should not allow importing of this feed until the **\<podcast:email>** or other defined feed owner (such as **\<managingEditor>**) is
-contacted and subsequently sets the "locked" element to "no" or removes it from the feed.
+If the "locked" element is present and set to "yes", podcasting hosts and platforms should not allow importing of this feed until the **\<podcast:verificationEmail>** or other
+defined feed owner (such as **\<managingEditor>**) is contacted and subsequently sets the "locked" element to "no" or removes it from the feed.
 
-The **\<podcast:previousUrl>** element acts like a relay header in an email envelope.  Each time a feed is imported, an additional **\<podcast:previousUrl>** should be added, and all previous ones preserved.
+The **\<podcast:previousUrl>** element acts like a relay header in an email envelope.  Each time a feed is imported, an additional **\<podcast:previousUrl>** should be
+added, and all previous ones preserved.
 
 Once a successful import has taken place, the **\<podcast:newFeedUrl>** element can be put in the old feed as a pointer to the new location.