From cf64b48a651aac6fb79034a23f50dcf4a56b2b9a Mon Sep 17 00:00:00 2001
From: Kevin Smith <git@kismith.co.uk>
Date: Fri, 23 Jan 2015 10:16:32 +0000
Subject: [PATCH] Fix data form examples in MAM

---
 xep-0313.xml | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/xep-0313.xml b/xep-0313.xml
index a734cf16..3e74dc42 100644
--- a/xep-0313.xml
+++ b/xep-0313.xml
@@ -27,6 +27,13 @@
   </schemaloc>
 	&mwild;
 	&ksmith;
+  <revision>
+    <version>0.4</version>
+    <date>2015-01-23</date>
+    <initials>ks/mw</initials>
+    <remark><p>Switch the sentinel message back to the iq result.
+        Various small fixes to the document.</p></remark>
+  </revision>
   <revision>
     <version>0.3</version>
     <date>2014-08-14</date>
@@ -193,8 +200,8 @@
     <example caption='Querying for all messages to/from a particular JID'><![CDATA[
 <iq type='set' id='juliet1'>
   <query xmlns='urn:xmpp:mam:0'>
-    <x xmlns='jabber:x:data'>
-      <field var='FORM_TYPE'>
+    <x xmlns='jabber:x:data' type='submit'>
+      <field var='FORM_TYPE' type='hidden'>
         <value>urn:xmpp:mam:0</value>
       </field>
       <field var='with'>
@@ -225,8 +232,8 @@
       <example caption='Querying the archive for all messages in a certain timespan'><![CDATA[
 <iq type='set' id='juliet1'>
   <query xmlns='urn:xmpp:mam:0'>
-    <x xmlns='jabber:x:data'>
-      <field var='FORM_TYPE'>
+    <x xmlns='jabber:x:data' type='submit'>
+      <field var='FORM_TYPE' type='hidden'>
         <value>urn:xmpp:mam:0</value>
       </field>
       <field var='start'>
@@ -242,8 +249,8 @@
       <example caption='Querying the archive for all messages after a certain time'><![CDATA[
 <iq type='set' id='juliet1'>
   <query xmlns='urn:xmpp:mam:0'>
-    <x xmlns='jabber:x:data'>
-      <field var='FORM_TYPE'>
+    <x xmlns='jabber:x:data' type='submit'>
+      <field var='FORM_TYPE' type='hidden'>
         <value>urn:xmpp:mam:0</value>
       </field>
       <field var='start'>
@@ -263,8 +270,8 @@
       <example caption='A query using Result Set Management'><![CDATA[
 <iq type='set' id='q29302'>
   <query xmlns='urn:xmpp:mam:0'>
-    <x xmlns='jabber:x:data'>
-      <field var='FORM_TYPE'>
+    <x xmlns='jabber:x:data' type='submit'>
+      <field var='FORM_TYPE' type='hidden'>
         <value>urn:xmpp:mam:0</value>
       </field>
       <field var='start'>
@@ -308,8 +315,8 @@
       <example caption='A page query using Result Set Management'><![CDATA[
 <iq type='set' id='q29303'>
   <query xmlns='urn:xmpp:mam:0'>
-      <x xmlns='jabber:x:data'>
-    	<field var='FORM_TYPE'><value>urn:xmpp:mam:0</value></field>>
+      <x xmlns='jabber:x:data' type='submit'>
+    	<field var='FORM_TYPE' type='hidden'><value>urn:xmpp:mam:0</value></field>>
     	<field var='start'><value>2010-08-07T00:00:00Z</value></field>
       </x>
       <set xmlns='http://jabber.org/protocol/rsm'>
@@ -362,7 +369,7 @@
 			<example><![CDATA[
 <iq type='set' id='query4'>
   <query xmlns='urn:xmpp:mam:0'>
-    <x xmlns='jabber:x:data' type='data'>
+    <x xmlns='jabber:x:data' type='submit'>
       <field type='hidden' var='FORM_TYPE'>
         <value>urn:xmpp:mam:0</value>
       </field>