diff --git a/xep-0355.xml b/xep-0355.xml
index 9430611d..650bff21 100644
--- a/xep-0355.xml
+++ b/xep-0355.xml
@@ -10,7 +10,7 @@
Cross-document editorial adjustments for inclusive language. Namespaces delegations are granted in the server configuration. Only &IQ; stanza namespaces can be delegated. A feature is delegated using: Once the managing entity is authenticated and stream is started, the server send it a &MESSAGE; stanza with a <delegation/> elements which MUST have the 'urn:xmpp:delegation:1' namespace. This element contains <delegated/> elements which MUST contain a 'namespace' attribute indicating the delegated namespace. If there is additional attribute filtering, the <delegated/> can have children <attribute/> elements which MUST contain a 'name' attribute with the name of the filtering attribute. Once the managing entity is authenticated and stream is started, the server send it a &MESSAGE; stanza with a <delegation/> elements which MUST have the 'urn:xmpp:delegation:2' namespace. This element contains <delegated/> elements which MUST contain a 'namespace' attribute indicating the delegated namespace. If there is additional attribute filtering, the <delegated/> can have children <attribute/> elements which MUST contain a 'name' attribute with the name of the filtering attribute. The server gets this stanza, sees that this namespace is delegated to pubsub.capulet.lit, so it forwards it. To forward, an &IQ; stanza of type "set" is used which contain a <delegation/> element (with namespace 'urn:xmpp:delegation:1') which in turn contain a <forwarded/> element encapsulating the initial stanza, according to &xep0297;: To forward, an &IQ; stanza of type "set" is used which contain a <delegation/> element (with namespace 'urn:xmpp:delegation:2') which in turn contain a <forwarded/> element encapsulating the initial stanza, according to &xep0297;: The managing entity replies to the stanza by encapsulating its &IQ; result in the same way:
+
+
-
If the forwarded result from managing entity is bad (i.e. wrong 'to', 'from', 'id' or 'result' attributes), the server MUST send an &IQ; error with condition <service-unavailable/> to managed entity, and MAY close the connexion with managing entity.
-In client mode, the managing entity is not certified by the server administrator, so the delegation MUST be explicitly allowed by the managed entity. This is initiated by the managing entity (it can be after an interaction with a managed entity, like a subscription).
-To request delegation for a particular entity, the managing entity MUST have an &IQ; stanza with 'urn:xmpp:delegation:1' namespace. The &QUERY; element MUST have a 'to' attribute which specify the entity it wants to manage.
+To request delegation for a particular entity, the managing entity MUST have an &IQ; stanza with 'urn:xmpp:delegation:2' namespace. The &QUERY; element MUST have a 'to' attribute which specify the entity it wants to manage.
Namespace delegations are asked with a <delegate/> element, which MUST contain a 'namespace' attribute set to the requested namespace.
If an entity want to manage PEP service for Juliet, it can ask the delegation like this:
Server SHOULD provide a way for clients to check already delegated namespaces, and revoke them by using &xep0050; on the well-defined command node 'urn:xmpp:delegation:1#configure'.
+Server SHOULD provide a way for clients to check already delegated namespaces, and revoke them by using &xep0050; on the well-defined command node 'urn:xmpp:delegation:2#configure'.
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 business rules).
If a server or an entity supports the namespace delegation protocol, it MUST report that fact by including a service discovery feature of "urn:xmpp:delegation:1" in response to a &xep0030; information request:
+If a server or an entity supports the namespace delegation protocol, it MUST report that fact by including a service discovery feature of "urn:xmpp:delegation:2" in response to a &xep0030; information request:
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.
-This is done by using a disco node, which is built in the following way: if pubsub.capulet.int manages pubsub namespace, it MUST report that fact in discovery feature, and have a 'urn:xmpp:delegation:1::http://jabber.org/protocol/pubsub' node which reports the managed features.
The node name is obtained by concatenating this XEP namespace (urn:xmpp:delegation:1), a '::' separator, and the delegated namespace (here http://jabber.org/protocol/pubsub).
The server MUST advertise the result in its own discovery answer, and MUST ignore features of its internal component (here internal PubSub service).
This is done by using a disco node, which is built in the following way: if pubsub.capulet.int manages pubsub namespace, it MUST report that fact in discovery feature, and have a 'urn:xmpp:delegation:2::http://jabber.org/protocol/pubsub' node which reports the managed features.
The node name is obtained by concatenating this XEP namespace (urn:xmpp:delegation:2), a '::' separator, and the delegated namespace (here http://jabber.org/protocol/pubsub).
The server MUST advertise the result in its own discovery answer, and MUST ignore features of its internal component (here internal PubSub service).
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.
juliet@capulet.int asks its server what it is capable of, she is specially interested in PubSub capabilities.
Note that 'http://jabber.org/protocol/pubsub#auto-create' is not available.
N.B.: In the special case of attribute filtering, the server still display managing entity's features for the whole delegated namespace instead of its own internal ones.
-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.
To do so, the mechanism is the same as for server features, but the separator is ':bare:' instead of '::':
-Extensions of Service Discovery as specified in &xep0128; follow the same rules: for the delegated namespace, internal extensions MUST be removed and extensions of managing entity MUST be included instead.
It may be necessary for a managing entity to advertise feature on a node which is unknown at the time of configuration. This is notably the case for a PEP component: features must be advertisable on disco nodes mapping pubsub nodes.
+To allows that, the special namespace 'urn:xmpp:delegation:2:bare:disco#info:*' is used, and means "delegate information discovery requests made on bare jids for any discovery node which is not already managed by the server".
+The node 'urn:xmpp:microblog:0' is not managed by the server. Normally, this would result as an <item-not-found> &IQ; error, but the namespace 'urn:xmpp:delegation:2:bare:disco#info:*' is delegated to pubsub.capulet.lit, thus the server delegate the stanza to the managing entity:
+The managing entity answers with its own disco features for the requested node:
+ +Then the server decapsulate the &IQ; result, validate it as explained in Server Forwards Delegated &IQ; Stanza, and send the result to Juliet:
+A managing entity must be able to answer items discovery requests on bare jids. For PEP components, this is used to show available nodes on the service. Furthermore, An information discovery request or an items discovery requests on a node corresponding to an item advertised by the managing entity must be forwarded to the managing entity too.
+This is done by using the special namespace 'urn:xmpp:delegation:2:bare:disco#items:*' which means "delegate items discovery made on bare jids with no node specified and all items discovery requests made on bare jids with a node which is not already managed by the server".
+Note: When no node is used, and unlike the disco#info case, the server SHOULD NOT nest its internal items with the ones from managing entity. The reason is that bare jids disco items are usually used for PEP nodes, and the server would then mix internal PEP nodes with the managing entity nodes, which would be confusing for XMPP clients and end-users. The server implementation MAY choose to nest items anyway, in which case the mechanism is the same as for disco#info.
+A server SHOULD NOT cache result of forwarded disco#items requests, as this is highly dynamic.
+ +The namespace 'urn:xmpp:delegation:2:bare:disco#items:*' is delegated to pubsub.capulet.lit, thus the server delegate the stanza to the managing entity:
+The managing entity answers with its own disco items for Juliet's JID:
+ +Then the server decapsulate the &IQ; result, validate it as explained in Server Forwards Delegated &IQ; Stanza, and send the result to Juliet:
+Juliet now wants to know the IDs of blog items which has been published on her blog, to do so she does an items discovery request on her own bare jid with the 'urn:xmpp:microblog:0' node:
+ +Because the special namespace 'urn:xmpp:delegation:2:bare:disco#items:*' is delegated to pubsub.capulet.lit, the server forward the request to this managing entity:
+The managing entity answers with its own disco items for the requested entity and node (pubsub.capulet.lit being a PEP service, the items are actually Juliet's blog items IDs):
+ +The server decapsulates the &IQ; result, validate it as explained in Server Forwards Delegated &IQ; Stanza, and send the result to Juliet:
+The ®ISTRAR; includes 'urn:xmpp:delegation:1' in its registry of protocol namespaces (see &NAMESPACES;).
+The ®ISTRAR; includes 'urn:xmpp:delegation:2' in its registry of protocol namespaces (see &NAMESPACES;).