From 9eb2453dceabf7f586abbb7239e8c134f1bb211c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?= <edhelas@movim.eu>
Date: Thu, 14 Sep 2017 10:37:16 +0200
Subject: [PATCH 1/3] Add pubsub#multi-items

---
 xep-0060.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/xep-0060.xml b/xep-0060.xml
index 796a39c3..4ae71010 100644
--- a/xep-0060.xml
+++ b/xep-0060.xml
@@ -5084,6 +5084,12 @@ And by opposing end them?
       <td>OPTIONAL</td>
       <td>Refer to <cite>XEP-0248</cite></td>
     </tr>
+    <tr>
+      <td>multi-items</td>
+      <td>The service supports the storage of multiple items per node.</td>
+      <td>OPTIONAL</td>
+      <td>&#160;</td>
+    </tr>
     <tr>
       <td>multi-subscribe</td>
       <td>A single entity may subscribe to a node multiple times.</td>
@@ -5970,6 +5976,11 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings;item=ae
   <desc>A single leaf node can be associated with multiple collections.</desc>
   <doc>XEP-0060</doc>
 </var>
+<var>
+  <name>http://jabber.org/protocol/pubsub#multi-items</name>
+  <desc>The service supports the storage of multiple items per node.</desc>
+  <doc>XEP-0060</doc>
+</var>
 <var>
   <name>http://jabber.org/protocol/pubsub#multi-subscribe</name>
   <desc>A single entity may subscribe to a node multiple times.</desc>
@@ -6829,6 +6840,7 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
                 <xs:enumeration value='meta-data'/>
                 <xs:enumeration value='modify-affiliations'/>
                 <xs:enumeration value='multi-collection'/>
+                <xs:enumeration value='multi-items'/>
                 <xs:enumeration value='multi-subscribe'/>
                 <xs:enumeration value='outcast-affiliation'/>
                 <xs:enumeration value='persistent-items'/>

From 5dfcb250deff1de54444836aa16b237b0bd2f679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?= <edhelas@movim.eu>
Date: Thu, 14 Sep 2017 12:17:01 +0200
Subject: [PATCH 2/3] Give some precisions between #multi-items and the
 #max_items configuration variable

---
 xep-0060.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/xep-0060.xml b/xep-0060.xml
index 4ae71010..9c4960d6 100644
--- a/xep-0060.xml
+++ b/xep-0060.xml
@@ -977,6 +977,9 @@ 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#max_items' label='Max # of items to persist' type='text-single'>
+        <value>120</value>
+      </field>
       <field var='pubsub#owner' label='Node owners' type='jid-multi'>
         <value>hamlet@denmark.lit</value>
       </field>
@@ -5086,7 +5089,7 @@ And by opposing end them?
     </tr>
     <tr>
       <td>multi-items</td>
-      <td>The service supports the storage of multiple items per node.</td>
+      <td>The service supports the storage of multiple items per node. It requires the pubsub#max_items configuration item to be exposed to the user and allow sensible values (above one) to be set in <link url='#owner-configure'>Configure a Node</link>.</td>
       <td>OPTIONAL</td>
       <td>&#160;</td>
     </tr>
@@ -6220,6 +6223,9 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings;item=ae
   <field var='pubsub#type'
          type='text-single'
          label='Payload type'/>
+  <field var='pubsub#max_items'
+         type='text-single'
+         label='Max # of items to persist'/>
 </form_type>
 ]]></code>
     </section3>

From 535b41712b23787d0569a03e7be0d564ece8f962 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?= <edhelas@movim.eu>
Date: Thu, 14 Sep 2017 12:27:21 +0200
Subject: [PATCH 3/3] Wording

---
 xep-0060.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xep-0060.xml b/xep-0060.xml
index 9c4960d6..9ec270ce 100644
--- a/xep-0060.xml
+++ b/xep-0060.xml
@@ -5089,7 +5089,7 @@ And by opposing end them?
     </tr>
     <tr>
       <td>multi-items</td>
-      <td>The service supports the storage of multiple items per node. It requires the pubsub#max_items configuration item to be exposed to the user and allow sensible values (above one) to be set in <link url='#owner-configure'>Configure a Node</link>.</td>
+      <td>The service supports the storage of multiple items per node. It requires the pubsub#max_items configuration item to be exposed to the user and allow sensible values (higher than one) to be set in <link url='#owner-configure'>Configure a Node</link>.</td>
       <td>OPTIONAL</td>
       <td>&#160;</td>
     </tr>