diff --git a/xep-0115.xml b/xep-0115.xml
index 1414bd11..6c66cfb8 100644
--- a/xep-0115.xml
+++ b/xep-0115.xml
@@ -610,13 +610,13 @@
 
   <section1 topic='XMPP Registrar Considerations' anchor='registrar'>
     <section2 topic='Protocol Namespaces' anchor='ns'>
-    <p>The &REGISTRAR; includes 'http://jabber.org/protocol/caps' in its registry of protocol namespaces  (see &NAMESPACES;).</p>
+    <p>The &REGISTRAR; includes "http://jabber.org/protocol/caps" in its registry of protocol namespaces  (see &NAMESPACES;).</p>
     </section2>
     <section2 topic='Service Discovery Features' anchor='registrar-features'>
-      <p>The XMPP Registrar shall include "http://jabber.org/protocol/caps#optimize" in its registry of service discovery features (see &DISCOFEATURES;).</p>
+      <p>The XMPP Registrar includes "http://jabber.org/protocol/caps" and "http://jabber.org/protocol/caps#optimize" in its registry of service discovery features (see &DISCOFEATURES;).</p>
     </section2>
     <section2 topic='Stream Features' anchor='registrar-stream-features'>
-      <p>The XMPP Registrar shall include "http://jabber.org/protocol/caps" in its registry of stream features (see &STREAMFEATURES;).</p>
+      <p>The XMPP Registrar includes "http://jabber.org/protocol/caps" in its registry of stream features (see &STREAMFEATURES;).</p>
     </section2>
   </section1>
 
@@ -657,7 +657,7 @@
   </xs:simpleType>
 
 </xs:schema>
-    ]]></code>
+]]></code>
   </section1>
 
   <section1 topic='Legacy Format' anchor='legacy'>