diff --git a/xep-0389.xml b/xep-0389.xml
index f541d0b3..36d08d9f 100644
--- a/xep-0389.xml
+++ b/xep-0389.xml
@@ -193,7 +193,7 @@
     and then a second dataform asking for a token provided to the user in a
     text message or phone call depending on which flow the user selects.
   </p>
-  <example caption="Host Advertises Stream Features"><![CDATA[
+  <example caption='Host Advertises Stream Features'><![CDATA[
 <stream:features>
   <mechanisms xmlns='urn:xmpp:sasl:0'>
     <mechanism>EXTERNAL</mechanism>
@@ -202,28 +202,28 @@
     <mechanism>PLAIN</mechanism>
   </mechanisms>
   <register xmlns='urn:xmpp:register:0'>
-    <flow id="0">
+    <flow id='0'>
       <name>Verify with SMS</name>
       <challenge>jabber:x:data</challenge>
     </flow>
-    <flow id="1">
+    <flow id='1'>
       <name>Verify by Phone Call</name>
       <challenge>jabber:x:data</challenge>
     </flow>
-    <flow id="2">
+    <flow id='2'>
       <name>Verify with the web</name>
       <challenge>jabber:x:data</challenge>
       <challenge>jabber:x:oob</challenge>
     </flow>
   </register>
   <recovery xmlns='urn:xmpp:register:0'>
-    <flow id="0">
+    <flow id='0'>
       <name>Visit Password Recovery Site</name>
       <challenge>jabber:x:oob</challenge>
     </flow>
   </recovery>
 </stream:features>]]></example>
-</section2>
+  </section2>
   <section2 topic='Service Discovery'>
     <p>
       Clients, servers, and other services such as components that support
@@ -244,19 +244,19 @@
     For example, to select the "Verify by Phone Call" registration flow from
     the previous example, the client would reply with:
   </p>
-  <example caption="Client selects a recovery flow"><![CDATA[
+  <example caption='Client selects a recovery flow'><![CDATA[
 <register xmlns='urn:xmpp:register:0'>
-  <flow id="1"/>
+  <flow id='1'/>
 </register>]]></example>
   <p>
     If the client is initiating registration or recovery after a stream has
     already been initiated it uses the same registration element wrapped in an
     IQ of type "set".
   </p>
-  <example caption="Client selects a recovery flow after stream negotiation"><![CDATA[
-<iq type="set" id="foo">
+  <example caption='Client selects a recovery flow after stream negotiation'><![CDATA[
+<iq type='set' id='foo'>
   <recovery xmlns='urn:xmpp:register:0'>
-    <flow id="0"/>
+    <flow id='0'/>
   </recovery>
 </iq>]]></example>
   <p>