Merge branch 'feature/xep-0060'

xep-0060.xml

@@ -49,6 +49,12 @@
   &pgmillard;
   &stpeter;
   &ralphm;
+  <revision>
+    <version>1.15.8</version>
+    <date>2019-06-19</date>
+    <initials>edhelas</initials>
+    <remark><p>Add pubsub#access_model and pubsub#publish_model to examples</p></remark>
+  </revision>
   <revision>
     <version>1.15.7</version>
     <date>2019-01-27</date>
@@ -1061,6 +1067,12 @@ And by opposing end them?
       <field var='pubsub#contact' label='People to contact with questions' type='jid-multi'>
         <value>bard@shakespeare.lit</value>
       </field>
+      <field var='pubsub#access_model' label='Access model' type='list-single'>
+        <value>open</value>
+      </field>
+      <field var='pubsub#publish_model' label='Publish model' type='list-single'>
+        <value>publishers</value>
+      </field>
       <field var='pubsub#max_items' label='Max # of items to persist' type='text-single'>
         <value>120</value>
       </field>
@@ -6308,6 +6320,12 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings;item=ae
   <field var='pubsub#language'
          type='list-single'
          label='The default language of the node'/>
+  <field var='pubsub#access_model'
+         type='list-single'
+         label='Access model'/>
+  <field var='pubsub#publish_model'
+         type='list-single'
+         label='Publish model'/>
   <field var='pubsub#num_subscribers'
          type='text-single'
          label='The number of subscribers to the node'/>