Merge branch 'louiz-xep0321-neutral-pronouns' of https://github.com/louiz/xeps into feature/xep-0321

xep-0321.xml

@@ -55,7 +55,7 @@
   <p>This document addresses the following requirements:</p>
   <ol>
     <li>Make it possible for remote services or entities to manage user's roster by the same mechanisms that descibed in the &rfc6121;.</li>
-    <li>Provide a way for user to control which services have permission to manage his roster.</li>
+    <li>Provide a way for user to control which services have permission to manage their roster.</li>
   </ol>
 </section1>
 <section1 topic='Glossary' anchor='glossary'>
@@ -82,7 +82,7 @@
     <text xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>You must have a presence subscription to be able to request remote roster management service.</text>
   </error>
 </iq>]]></example>
-    <p>The user's server SHOULD then generate a form request using &xep0004; to client in order to ask user if he's OK with granting the permission to the remote entity. The "challenge" form field is generated by the server and is used to identify the client's response. The server also MUST immediatly answer to the request IQ.</p>
+    <p>The user's server SHOULD then generate a form request using &xep0004; to client in order to ask user if they are OK with granting the permission to the remote entity. The "challenge" form field is generated by the server and is used to identify the client's response. The server also MUST immediatly answer to the request IQ.</p>
     <p>NOTE: if the entity is already granted with the permission, the server SHOULD immediatly answer with a success response and skip querying the user.</p>
     <example caption='Server asks user for the permission'><![CDATA[
 <message from='example.com'
@@ -220,7 +220,7 @@
   <text xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>You have tried to modify the item you don't allowed to.</text>
 </iq>]]></example>
   </section2>
-  <section2 topic='Client requests list of components with permissions to edit his roster'>
+  <section2 topic='Client requests list of components with permissions to edit their roster'>
    <p>User can ask the server to provide a list of components or servers which have permissions to edit their roster.</p>
     <example caption='User asks the server to get list of components which can edit their roster'><![CDATA[
 <iq from='juliet@example.com/home' to='icq.example.com' type='get' id='roster_5'>