--- a/xmpp/xep-proto-namespace-delegation.xml	Thu Nov 13 14:12:19 2014 +0100
+++ b/xmpp/xep-proto-namespace-delegation.xml	Tue Nov 18 13:20:14 2014 +0100
@@ -42,13 +42,13 @@
   </revision>
 </header>
 <section1 topic='Introduction' anchor='intro'>
-    <p>Some XMPP features must be offered by the server itself, or can't be available, that's the case of &xep0163; which is used in several places (e.g. bookmarks storage). But it can be desirable to use an external entity to manage some of these features, because it implements things that the server don't, or because it use a special implementation useful in a particular case. Some people may also want to decentralize a feature on an entity under their control. This XEP try to solve these cases.<br/>Additionaly, a method to do generic treatments (independant of server) on stanza is also provided.</p>
-    <p>This XEP is complementary to priviliged entity XEP (and works in a similar way), although they can be used together or separely</p>
+    <p>Some XMPP features must be offered by the server itself, or can't be available, that's the case of &xep0163; which is used in several places (e.g. bookmarks storage). But it can be desirable to use an external entity to manage some of these features, because it implements things that the server don't, or because it uses a special implementation useful in a particular case. Some people may also want to decentralize a feature on an entity under their control. This XEP try to solve these cases.<br/>Additionaly, a method to do generic treatments (independent of server) on stanza is also provided.</p>
+    <p>This XEP is complementary to priviliged entity XEP (and works in a similar way), although they can be used together or separately.</p>
     <p>Here are some use cases of namespace delegation:</p>
         <ul>
-            <li>use an external component for a PEP service because the server doesn't implement it or lack some features</li>
+            <li>use an external component for a PEP service because the server doesn't implement it or lacks some features</li>
             <li>decentralize a server feature to an entity under client control</li>
-            <li>do a component which react on new user registration, independent of server implementation</li>
+            <li>make a component which react on new user registration, independent of server implementation</li>
             <li>server agnostic roster filtering</li>
         </ul>
 </section1>
@@ -58,22 +58,22 @@
             <li><strong>admin</strong> mode, where delegation is specified by the server administrator.</li>
             <li><strong>client</strong> mode, where it can be requested by any user.</li>
         </ul>
-    <p>In <em>admin</em> mode, the managing entity manage stanza of the delegated namespace for all users registered on the server. The namespace delegation MUST be totally transparent for the managed entities.</p>
-    <p>In <em>client</em> mode, a managing entity MUST have an explicit autorization for any namespace he wants to use. Client SHOULD be able to check and revoke granted permissions, and if it's not possible, permissions MUST be revoked after a disconnection.</p>
+    <p>In <em>admin</em> mode, the managing entity manages stanza of the delegated namespace for all users registered on the server. The namespace delegation MUST be totally transparent for the managed entities.</p>
+    <p>In <em>client</em> mode, a managing entity MUST have an explicit authorization for any namespace he wants to use. Client SHOULD be able to check and revoke granted permissions, and if it's not possible, permissions MUST be revoked after a disconnection.</p>
 </section1>
 <section1 topic='Glossary' anchor='glossary'>
   <ul>
     <li><strong>Delegated namespace</strong> — the namespace being managed by an external entity.</li>
-    <li><strong>Managing entity</strong> — the entity which actualy manage the delegated namespace.</li>
+    <li><strong>Managing entity</strong> — the entity which actualy manages the delegated namespace.</li>
     <li><strong>Managed entity</strong> — an entity which wants to have a namespace of its server delegated to a managing entity.</li>
   </ul>
 </section1>
 <section1 topic='Admin Mode Use Cases' anchor='admin_usecases'>
 
     <section2 topic='Delegation Request Use Case' anchor='admin_perm'>
-        <section3 topic='Entity Request Delegation Of Namespaces' anchor='req_delegation'>
-            <p>Once the managing entity is authentified and stream is started, the entity can request to manage a namespace. It do it by sending an &IQ; stanza with <strong>'urn:xmpp:delegation:0'</strong> namespace. The &QUERY; element MUST have a type of value "request" and MAY have a 'delegation' attribute with the value "admin".</p>
-            <p>Namespace delegations are asked with a &lt;delegate/&gt; element, which MUST contain a 'namespace' attribute set to the requested namespace</p>
+        <section3 topic='Entity Requests Namespace Delegation' anchor='req_delegation'>
+            <p>Once the managing entity is authenticated and stream is started, the entity can request to manage a namespace. It does it by sending an &IQ; stanza with <strong>'urn:xmpp:delegation:0'</strong> namespace. The &QUERY; element MUST have a type of value "request" and MAY have a 'delegation' attribute with the value "admin".</p>
+            <p>Namespace delegations are asked with a &lt;delegate/&gt; element, which MUST contain a 'namespace' attribute set to the requested namespace.</p>
             <p>Only &lt;iq/&gt; stanza namespaces can be delegated.</p>
             <example caption='entity asks for delegation in admin mode'><![CDATA[
 <iq from='pubsub.capulet.lit' type='get' id='delegation1'>
@@ -84,8 +84,8 @@
 </iq>
             ]]></example>
         </section3>
-        <section3 topic='Server Accept Namespace Delegation' anchor='accept_delegation'>
-            <p>If the server accept the delegation (e.g.: namespace mapping specified in configuration), it MUST return an &IQ; result stanza, with allowed delegations in &lt;delegate&gt; elements:</p>
+        <section3 topic='Server Accepts Namespace Delegation' anchor='accept_delegation'>
+            <p>If the server accepts the delegation (e.g.: namespace mapping specified in configuration), it MUST return an &IQ; result stanza, with allowed delegations in &lt;delegate&gt; elements:</p>
             <example caption='server accept namespace delegations'><![CDATA[
 <iq from='capulet.lit' to='pubsub.capulet.lit' type='result' id='delegation1'>
     <query xmlns='urn:xmpp:delegation:0' type='allowed'>
@@ -95,11 +95,11 @@
 </iq>
 ]]></example>
 <p>Note: the granted delegations MAY be different from the requested ones, according to server's configuration.</p>
-<p>The server MUST then forward all requests done to itself on this namespace to the managing entity, except the request done by the managing entity itself (see below).<br/>
-   The server MUST NOT forward any request done to an other entity than itself or a bare jid with its domain.</p>
+<p>The server MUST then forward all requests made to itself on this namespace to the managing entity, except the requests made by the managing entity itself (see below).<br/>
+   The server MUST NOT forward any request made to an other entity than itself or to a bare JID within its domain.</p>
         </section3>
-        <section3 topic='Server Reject Namespace Delegation' anchor='reject_delegation'>
-            <p>If the server reject the delegation, it MUST return a &forbidden; error:</p>
+        <section3 topic='Server Rejects Namespace Delegation' anchor='reject_delegation'>
+            <p>If the server rejects the delegation, it MUST return a &forbidden; error:</p>
             <example caption='server reject delegation'><![CDATA[
 <iq from='capulet.lit' to='pubsub.capulet.lit' type='error' id='delegation1'>
     <error type='cancel'>
@@ -110,9 +110,9 @@
         </section3>
     </section2>
 
-    <section2 topic='Server Forward Delegated &IQ; Stanza' anchor='stanza_forward'>
-        <p>When a server receives a stanza for a delegated namespace which is either directed to him (no 'to' attribute, or 'to' attribute with its own jid), or directed to the bare jid of the sender (e.g. if 'from' attribute is "<em>juliet@capulet.lit/balcony</em>" and 'to' attribute is "<em>juliet@capulet.lit</em>"), it MUST forward it to the managing entity by replacing the 'to' attribute with the jid of the managing entity:</p>
-            <example caption='juliet send her mood to her sever via pep'><![CDATA[
+    <section2 topic='Server Forwards Delegated &IQ; Stanza' anchor='stanza_forward'>
+        <p>When a server receives a stanza for a delegated namespace which is either directed to him (no 'to' attribute, or 'to' attribute with its own JID), or directed to the bare JID of the sender (e.g. if 'from' attribute is "<em>juliet@capulet.lit/balcony</em>" and 'to' attribute is "<em>juliet@capulet.lit</em>"), it MUST forward it to the managing entity by replacing the 'to' attribute with the JID of the managing entity:</p>
+            <example caption='Juliet sends her mood to her server via PEP'><![CDATA[
 <iq from='juliet@capulet.lit/balcony'
     id='pep1'
     type='set'>
@@ -128,9 +128,9 @@
     </pubsub>
 </iq>
 ]]></example>
-<p>The server get this stanza, see that this namespace is delegated to <em>pubsub.capulet.lit</em>, so it forward it:</p>
+<p>The server gets this stanza, sees that this namespace is delegated to <em>pubsub.capulet.lit</em>, so it forwards it:</p>
 
-<example caption='sever delegate the stanza to pubsub.capulet.lit'><![CDATA[
+<example caption='server delegate the stanza to pubsub.capulet.lit'><![CDATA[
 <iq from='juliet@capulet.lit/balcony'
     to='pubsub.capulet.lit'
     id='delegate1'
@@ -148,33 +148,33 @@
 </iq>
 ]]></example>
 
-<p>The managing entity reply normally to the stanza:</p>
-<example caption='pubsub.capulet.lit reply to juliet'><![CDATA[
+<p>The managing entity replies normally to the stanza:</p>
+<example caption='pubsub.capulet.lit replies to Juliet'><![CDATA[
 <iq from='pubsub.capulet.lit'
-    to='juliet.capulet.lit/balcony'
+    to='juliet@capulet.lit/balcony'
     id='delegate1'
     type='result'>
     <pubsub xmlns='http://jabber.org/protocol/pubsub' />
 </iq>
 ]]></example>
 
-<p>Then the server MUST change the from field of managing entity to its own field, and send the answer back to Julied with the original &IQ; id</p>
+<p>Then the server MUST change the from field of managing entity to its own JID, and send the answer back to Juliet with the original &IQ; id.</p>
 
-<example caption='capulet.lit reply to juliet'><![CDATA[
+<example caption='capulet.lit replies to Juliet'><![CDATA[
 <iq from='capulet.lit'
-    to='juliet.capulet.lit/balcony'
+    to='juliet@capulet.lit/balcony'
     id='pep1'
     type='result'>
     <pubsub xmlns='http://jabber.org/protocol/pubsub' />
 </iq>
 ]]></example>
 
-    <p>The workflow is fully transparent for Juliet</p>
+    <p>The workflow is fully transparent for Juliet.</p>
     <section3 topic='Stanzas from managing entity' anchor='managing_entity_stanzas'>
-        <p>If a stanza is sent by the managing entity on a managed namespace, the server MUST NOT forward it. This way, the managing entity can use privileged entity to do special treatments</p>
-        <p>In the following examples, <em>juliet@capulet.lit</em> has its "<em>jabber:iq:roster</em>" namespace delegated to <em>filter.capulet.lit</em>. <em>filter.capulet.lit</em> is a server agnostic component which filter allowed entity (which can be added to a roster), and sort them in enforced groups</p>
+        <p>If a stanza is sent by the managing entity on a managed namespace, the server MUST NOT forward it. This way, the managing entity can use privileged entity to do special treatments.</p>
+        <p>In the following examples, <em>juliet@capulet.lit</em> has its "<em>jabber:iq:roster</em>" namespace delegated to <em>filter.capulet.lit</em>. <em>filter.capulet.lit</em> is a server agnostic component which filters allowed entities (which can be added to a roster), and sort them in enforced groups.</p>
 
-        <example caption='Juliet add Romeo to her roster'><![CDATA[
+        <example caption='Juliet adds Romeo to her roster'><![CDATA[
 <iq from='juliet@capulet.lit/balcony'
           id='roster1'
           type='set'>
@@ -186,7 +186,7 @@
 </iq>
 ]]></example>
 
-        <example caption='server forward stanza to managing entity'><![CDATA[
+        <example caption='server forwards stanza to managing entity'><![CDATA[
 <iq from='juliet@capulet.lit/balcony'
           to='filter.capulet.lit'
           id='delegate1'
@@ -199,7 +199,7 @@
 </iq>
 ]]></example>
 
-<p><em>filter.capulet.lit</em> accept to add Romeo, but all jids with a <em>montaigu.lit</em> must be in a "Rivals" group, so it first return a success result (romeo is accepted)</p>
+<p><em>filter.capulet.lit</em> accepts to add Romeo, but all JIDs with a <em>montaigu.lit</em> must be in a "Rivals" group, so it first returns a success result (Romeo is accepted).</p>
         <example caption='filtering component accept Romeo'><![CDATA[
 <iq from='filter.capulet.lit'
     to='juliet@capulet.lit/balcony'
@@ -212,8 +212,8 @@
     type='result' />
 ]]></example>
 
-    <p>At this stade, the entity is accepted, but not added to the roster. <em>filter.capulet.lit</em> is also a privileged entity which can manage "<em>jabber:iq:roster</em>", so it use this ability to add romeo with the enforced group:</p>
-        <example caption='filter.capulet.lit use privileged entity to add romeo'><![CDATA[
+    <p>At this stade, the entity is accepted, but not added to the roster. <em>filter.capulet.lit</em> is also a privileged entity which can manage "<em>jabber:iq:roster</em>", so it uses this ability to add Romeo in the enforced group:</p>
+        <example caption='filter.capulet.lit uses privileged entity to add Romeo'><![CDATA[
 <iq to='juliet@capulet.lit'
     from='filter.capulet.lit'
     id='roster2'
@@ -226,7 +226,7 @@
     </query>
 </iq>
 ]]></example>
-    <p>The namespace is delegated, but as the stanza is from the managing entity, the server manage it normally. The entity is also privileged, so it can change the stanza of Juliet, the server accept:</p>
+    <p>The namespace is delegated, but as the stanza is from the managing entity, the server manages it normally. The entity is also privileged, so it can change the stanza of Juliet, the server accepts:</p>
 
     <example caption='server accept new entity in roster'><![CDATA[
 <iq to='filter.capulet.lit'
@@ -251,7 +251,7 @@
             <li>the delegation type is <em>client</em> instead of <em>admin</em></li>
             <li>the delegation is done per entity, so the managed entity MUST be specified in a 'to' attribute</li>
         </ol>
-        <p>If an entity want to manage PEP service for juliet, it can ask the delegation like this:
+        <p>If an entity want to manage PEP service for Juliet, it can ask the delegation like this:
         </p>
         <example caption='managing entity asks for namespace delegation for one particular entity'><![CDATA[
 <iq from='pubsub.montaigu.lit' to='capulet.lit' type='get' id='delegation1'>
@@ -269,9 +269,9 @@
 <message from='capulet.lit' to='juliet@capulet.lit'>
     <body>
         pubsub.montaigu.lit wants to manage a feature normally managed by the server.
-        Do you you allow him to manage the following features ?
+        Do you allow it to manage the following features?
 
-        Be careful ! According management to entity is a serious thing,
+        Be careful! According management to an entity is a serious thing,
         think twice that you can trust the entity before doing this.
     </body>
     <x xmlns='jabber:x:data' type='form'>
@@ -305,8 +305,8 @@
   </x>
 </message>
         ]]></example>
-        <p>Here juliet accept that <em>pubsub.montaigu.lit</em> manage the PubSub (and then PEP) service.</p>
-        <p>Finaly, the server notify the entity of the delegation granted. For this it use a &QUERY; element with the 'allowed' type, and put the client jid in a 'from' attribute:</p>
+        <p>Here Juliet allows <em>pubsub.montaigu.lit</em> to manage the PubSub (and then PEP) service.</p>
+        <p>Finaly, the server notifies the entity of the granted delegation. For this it uses a &QUERY; element with the 'allowed' type, and puts the client JID in a 'from' attribute:</p>
         <example caption='server notify accepted delegations'><![CDATA[
 <iq from='capulet.lit' to='pubsub.montaigu.lit' type='set' id='delegation2'>
     <query xmlns='urn:xmpp:delegation:0'
@@ -322,8 +322,8 @@
 </section1>
 
 <section1 topic='Configuration' anchor='configuration'>
-    <p>Server SHOULD provide a way to clients to check already delegated namespaces, and revoke them by using &xep0050; on the well-defined command node of <strong>'urn:xmpp:delegation:0#configure'</strong>.</p>
-    <p>If present, the configurations commands MUST allow at least to check delegations granted to a managing entity, and to revoke them. A server MAY offer an option to keep delegations from one session to an other (see <link url='#rules'>business rules</link>).</p>
+    <p>Server SHOULD provide a way for clients to check already delegated namespaces, and revoke them by using &xep0050; on the well-defined command node <strong>'urn:xmpp:delegation:0#configure'</strong>.</p>
+    <p>If present, the configuration commands MUST allow at least to check delegations granted to a managing entity, and to revoke them. A server MAY offer an option to keep delegations from one session to an other (see <link url='#rules'>business rules</link>).</p>
 </section1>
 
 <section1 topic='Discovering Support' anchor='disco'>
@@ -352,10 +352,10 @@
     </section2>
     <section2 topic='Nesting' anchor='disco_nesting'>
     <section3 topic='General Case'>
-        <p>When a server delegate a namespace to a managing entity, the later can have particular features which must be advertised by the former with disco protocol.</p>
-        <p>This is done by using a disco node, which is done in the following way: if pubsub.capulet.int manage pubsub namespace, it MUST report that fact in discovery feature, and have a '<strong>urn:xmpp:delegation:0::http://jabber.org/protocol/pubsub</strong>' node which report features managed.</p><p>The node name is obtained by concatenating this XEP namespace (<strong>urn:xmpp:delegation:0</strong>), a '<strong>::</strong>' separator, and the delegated namespace (here <strong>http://jabber.org/protocol/pubsub</strong>).<br/>The server MUST advertise the result in its own discovery answer, and MUST ignore features of its internal component (here internal PubSub service).</p>
-<p>In the following example, the capulet.int server delegate it's internal PEP component to pubsub.capulet.int. capulet.int only support REQUIRED PubSub features and auto-create, while pubsub.capulet.int support also REQUIRED PubSub features and publish-options, but not auto-create. <br/>juliet@capulet.int ask its server what it is capable of, she is specially interested in  PubSub capabilities.</p>
-<example caption="Juliet ask her server its available features"><![CDATA[
+        <p>When a server delegates a namespace to a managing entity, the later can have particular features which must be advertised by the former with disco protocol.</p>
+        <p>This is done by using a disco node, which is done the following way: if pubsub.capulet.int manages pubsub namespace, it MUST report that fact in discovery feature, and have a '<strong>urn:xmpp:delegation:0::http://jabber.org/protocol/pubsub</strong>' node which reports the managed features.</p><p>The node name is obtained by concatenating this XEP namespace (<strong>urn:xmpp:delegation:0</strong>), a '<strong>::</strong>' separator, and the delegated namespace (here <strong>http://jabber.org/protocol/pubsub</strong>).<br/>The server MUST advertise the result in its own discovery answer, and MUST ignore features of its internal component (here internal PubSub service).</p>
+<p>In the following example, the capulet.int server delegates its internal PEP component to pubsub.capulet.int. capulet.int only supports REQUIRED PubSub features and auto-create, while pubsub.capulet.int supports REQUIRED PubSub features and publish-options, but not auto-create. <br/>juliet@capulet.int asks its server what it is capable of, she is specially interested in PubSub capabilities.</p>
+<example caption="Juliet asks her server its available features"><![CDATA[
 <iq from='juliet@capulet.lit/balcony'
     id='disco1'
     to='capulet.lit'
@@ -364,8 +364,8 @@
 </iq>
   ]]>
 </example>
-<p>Server delegate its PubSub namespace to <em>pubsub.capulet.lit</em>, so it ask its available features for this namespace like this</p>
-<example caption="capulet.lit request disco infos for pubsub namespace to pubsub.capulet.lit"><![CDATA[
+<p>Server delegates its PubSub namespace to <em>pubsub.capulet.lit</em>, so it asks its available features for this namespace like this:</p>
+<example caption="capulet.lit requests disco infos for pubsub namespace to pubsub.capulet.lit"><![CDATA[
 <iq from='capulet.lit'
     id='disco2'
     to='pubsub.capulet.lit'
@@ -376,7 +376,7 @@
   ]]>
 </example>
 <p>Note that in real situation, server has probably this information already in cache (see <link url='#impl'>Implementation Notes</link>).<br/>
-   <em>pubsub.capulet.lit</em> return its available features</p>
+   <em>pubsub.capulet.lit</em> returns its available features:</p>
 <example caption="pubsub.capulet.lit returns features to nest"><![CDATA[
 <iq from='pubsub.capulet.lit'
     id='disco2'
@@ -413,11 +413,11 @@
 </example>
 <p>Note that '<em>http://jabber.org/protocol/pubsub#auto-create</em>' is not available.</p>
     </section3>
-    <section3 topic='rediction of bare jid disco info'>
-        <p>As an entity may ask for discovery informations on bare jid, which the server would answer, the managing entity must be able to send this kind of information.</p>
+    <section3 topic='Rediction Of Bare JID Disco Info'>
+        <p>As an entity may ask for discovery information on bare JID, which the server would answer, the managing entity must be able to send this kind of information.</p>
         <p>To do so, the mechanism is the same as for server features, but the separator is '<strong>:bare:</strong>' instead of '<strong>::</strong>':</p>
 
-<example caption="Juliet ask features for its own bare jid"><![CDATA[
+<example caption="Juliet asks features for its own bare JID"><![CDATA[
 <iq from='juliet@capulet.lit/balcony'
     id='disco3'
     to='juliet@capulet.lit'
@@ -426,8 +426,8 @@
 </iq>
   ]]>
 </example>
-<p>Server delegate its PubSub namespace to <em>pubsub.capulet.lit</em>, so it ask its available features for this namespace like this</p>
-<example caption="capulet.lit request disco infos for pubsub namespace to pubsub.capulet.lit"><![CDATA[
+<p>Server delegate its PubSub namespace to <em>pubsub.capulet.lit</em>, so it ask its available features for this namespace like this:</p>
+<example caption="capulet.lit requests disco infos for pubsub namespace to pubsub.capulet.lit"><![CDATA[
 <iq from='capulet.lit'
     id='disco4'
     to='pubsub.capulet.lit'
@@ -438,7 +438,7 @@
   ]]>
 </example>
 <p>As for general case, server has probably <link url='#impl'>this information already in cache</link>.<br/>
-   <em>pubsub.capulet.lit</em> return its available features</p>
+   <em>pubsub.capulet.lit</em> returns its available features:</p>
 <example caption="pubsub.capulet.lit returns features to nest"><![CDATA[
 <iq from='pubsub.capulet.lit'
     id='disco4'
@@ -463,8 +463,8 @@
 </iq>
   ]]>
 </example>
-<p>then the server return the answer to Juliet, as in general case, with requested bare jid in 'from' field.</p>
-<example caption="capulet.lit return disco info to Juliet"><![CDATA[
+<p>Then the server returns the answer to Juliet, as in general case, with requested bare JID in 'from' field.</p>
+<example caption="capulet.lit returns disco info to Juliet"><![CDATA[
 <iq from='juliet@capulet.lit'
     id='disco3'
     to='juliet@capulet.lit/balcony'
@@ -495,10 +495,10 @@
 
 <section1 topic='Business Rules' anchor='rules'>
     <ol>
-        <li>In client mode, server MAY keep delegations granted to an entity by a client from one session to an other, but if it do so, it MUST provide configuration like explained in the <link url='#configuration'>suitable section</link>. If server offer this feature, it SHOULD add a field directly in configuration commands.</li>
+        <li>In client mode, server MAY keep delegations granted to an entity by a client from one session to an other, but if it does so, it MUST provide configuration like explained in the <link url='#configuration'>suitable section</link>. If server offers this feature, it SHOULD add a field directly in configuration commands.</li>
         <li>If a client can't check or revoke delegations (i.e. it doesn't support &xep0050;) when granting them, the server MUST NOT keep granted delegations from one session to an other, and delegations will be asked on each new session.</li>
-        <li>If delegations are changed during a session, server MUST notify managing entity of the new delegations, like in <link url='#client_delegation'>client delegation request use case</link> </li>
-        <li>The namespace of this XEP (<strong>urn:xmpp:delegation:0</strong>) MUST NOT be delegated. If an entity request it, the server MUST return a &forbidden; error</li>
+        <li>If delegations are changed during a session, server MUST notify managing entity of the new delegations, like in <link url='#client_delegation'>client delegation request use case</link>.</li>
+        <li>The namespace of this XEP (<strong>urn:xmpp:delegation:0</strong>) MUST NOT be delegated. If an entity requests it, the server MUST return a &forbidden; error.</li>
     </ol>
 </section1>
 <section1 topic='Implementation Notes' anchor='impl'>
@@ -510,9 +510,9 @@
 <section1 topic='Security Considerations' anchor='security'>
     <ol>
         <li>Managing entity can manage sensitive data, <em>admin</em> delegation should be granted carefuly, only if you absolutely trust the entity.</li>
-        <li>A server MAY choose to filter allowed namespaces. In this case, it MUST always set the allowed type of filtered namespaces to <strong>0</strong></li>
+        <li>A server MAY choose to filter allowed namespaces. In this case, it MUST always set the allowed type of filtered namespaces to <strong>0</strong>.</li>
 
-        <li>In case of filtering, a whitelist system is more secure and SHOULD be prefered to a blacklist (idealy, configuration would allow no filtering, whitelist filtering and blacklist filtering)</li>
+        <li>In case of filtering, a whitelist system is more secure and SHOULD be prefered to a blacklist (idealy, configuration would allow no filtering, whitelist filtering and blacklist filtering).</li>
     </ol>
 </section1>
 <section1 topic='IANA Considerations' anchor='iana'>