schema and registrar corrections

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@1257 4b5297f7-1745-476d-ba37-a9c6900126ab

xep-0060.xml

@@ -5874,15 +5874,40 @@ O, what a rogue and peasant slave am I!
   <section2 topic='Service Discovery Features' anchor='registrar-features'>
     <p>The XMPP Registrar maintains a registry of service discovery features (see &DISCOFEATURES;), which includes a number of features that may be returned by pubsub services. The following registry submission has been provided to the XMPP Registrar for that purpose.</p>
     <code><![CDATA[
+<var>
+  <name>http://jabber.org/protocol/pubsub#access-authorize</name>
+  <desc>The default node access model is authorize.</desc>
+  <doc>XEP-0060</doc>
+</var>
+<var>
+  <name>http://jabber.org/protocol/pubsub#access-open</name>
+  <desc>The default node access model is open.</desc>
+  <doc>XEP-0060</doc>
+</var>
+<var>
+  <name>http://jabber.org/protocol/pubsub#access-presence</name>
+  <desc>The default node access model is presence.</desc>
+  <doc>XEP-0060</doc>
+</var>
+<var>
+  <name>http://jabber.org/protocol/pubsub#access-roster</name>
+  <desc>The default node access model is roster.</desc>
+  <doc>XEP-0060</doc>
+</var>
+<var>
+  <name>http://jabber.org/protocol/pubsub#access-whitelist</name>
+  <desc>The default node access model is whitelist.</desc>
+  <doc>XEP-0060</doc>
+</var>
 <var>
   <name>http://jabber.org/protocol/pubsub#auto-create</name>
   <desc>The service supports automatic creation of nodes on first publish.</desc>
-  <doc>XEP-0163</doc>
+  <doc>XEP-0060</doc>
 </var>
 <var>
   <name>http://jabber.org/protocol/pubsub#auto-subscribe</name>
   <desc>The service supports automatic subscription to a nodes based on presence subscription.</desc>
-  <doc>XEP-0163</doc>
+  <doc>XEP-0060</doc>
 </var>
 <var>
   <name>http://jabber.org/protocol/pubsub#collections</name>
@@ -5917,7 +5942,7 @@ O, what a rogue and peasant slave am I!
 <var>
   <name>http://jabber.org/protocol/pubsub#filtered-notifications</name>
   <desc>The service supports filtering of notifications based on Entity Capabilities.</desc>
-  <doc>XEP-0163</doc>
+  <doc>XEP-0060</doc>
 </var>
 <var>
   <name>http://jabber.org/protocol/pubsub#get-pending</name>
@@ -5940,7 +5965,7 @@ O, what a rogue and peasant slave am I!
     The service supports sending of the last published item to new 
     subscribers and to newly available resources.
   </desc>
-  <doc>XEP-0163</doc>
+  <doc>XEP-0060</doc>
 </var>
 <var>
   <name>http://jabber.org/protocol/pubsub#leased-subscription</name>
@@ -5992,6 +6017,11 @@ O, what a rogue and peasant slave am I!
   <desc>Presence-based delivery of event notifications is supported.</desc>
   <doc>XEP-0060</doc>
 </var>
+<var>
+  <name>http://jabber.org/protocol/pubsub#presence-subscribe</name>
+  <desc>Implicit presence-based subscriptions are supported.</desc>
+  <doc>XEP-0060</doc>
+</var>
 <var>
   <name>http://jabber.org/protocol/pubsub#publish</name>
   <desc>Publishing items is supported.</desc>
@@ -6729,15 +6759,24 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=unsubscribe;node=princely_musings
           <xs:attribute name='feature' use='required'>
             <xs:simpleType>
               <xs:restriction base='xs:NCName'>
+                <xs:enumeration value='access-authorize'/>
+                <xs:enumeration value='access-open'/>
+                <xs:enumeration value='access-presence'/>
+                <xs:enumeration value='access-roster'/>
+                <xs:enumeration value='access-whitelist'/>
+                <xs:enumeration value='auto-create'/>
+                <xs:enumeration value='auto-subscribe'/>
                 <xs:enumeration value='collections'/>
                 <xs:enumeration value='config-node'/>
                 <xs:enumeration value='create-and-configure'/>
                 <xs:enumeration value='create-nodes'/>
                 <xs:enumeration value='delete-any'/>
                 <xs:enumeration value='delete-nodes'/>
+                <xs:enumeration value='filtered-notifications'/>
                 <xs:enumeration value='get-pending'/>
                 <xs:enumeration value='instant-nodes'/>
                 <xs:enumeration value='item-ids'/>
+                <xs:enumeration value='last-published'/>
                 <xs:enumeration value='leased-subscription'/>
                 <xs:enumeration value='manage-subscriptions'/>
                 <xs:enumeration value='member-affiliation'/>
@@ -6748,7 +6787,9 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=unsubscribe;node=princely_musings
                 <xs:enumeration value='outcast-affiliation'/>
                 <xs:enumeration value='persistent-items'/>
                 <xs:enumeration value='presence-notifications'/>
+                <xs:enumeration value='presence-subscribe'/>
                 <xs:enumeration value='publish'/>
+                <xs:enumeration value='publish-options'/>
                 <xs:enumeration value='publisher-affiliation'/>
                 <xs:enumeration value='purge-nodes'/>
                 <xs:enumeration value='retract-items'/>
@@ -6766,6 +6807,7 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=unsubscribe;node=princely_musings
       </xs:simpleContent>
     </xs:complexType>
   </xs:element>
+
   <xs:element name='unsupported-access-model' type='empty'/>
 
   <xs:simpleType name='empty'>