diff --git a/xep-0176.xml b/xep-0176.xml
index f0945d40..fe74d282 100644
--- a/xep-0176.xml
+++ b/xep-0176.xml
@@ -2,7 +2,7 @@
%ents;
-ICE-12">
+ICE-12">
]>
Modified spec to use provisional namespace before advancement to Draft (per XEP-0053). Updated to track ICE-12; corrected service discovery process; completed editorial review; removed mention of DTMF, which is for audio only. Updated to track ICE-12; corrected service discovery process; completed editorial review; removed mention of DTMF, which is for audio only.
Updated to track ICE-10; added section on service discovery.
Updated to track ICE-10; added section on service discovery.
Specified that DTMF must use in-band signalling (XEP-0181).
Specified that DTMF must use in-band signalling (XEP-0181).
Recommended use of RTP-native methods for DTMF.
Recommended use of RTP-native methods for DTMF.
Initial version (split from XEP-0166).
&xep0166; defines a framework for negotiating and managing out-of-band data sessions over XMPP. In order to provide a flexible framework, the base Jingle specification defines neither data transport methods nor content formats, leaving that up to separate specifications. The current document defines a transport method for establishing and managing data connections between XMPP entities, using the &ice; methodology currently being developed within the IETF.
-The process for ICE negotiation is largely the same in Jingle as it is in draft-ietf-mmusic-ice. There are several differences:
+Note: This document depends on the IETF's &ice; specification, which is a work in progress. Every effort has been made to keep this document synchronized with draft-ietf-mmusic-ice, for which the latest published version is 12 (hereafter referred to as "&icecurr;"). The interested reader is referred to the &icecurr; for a detailed description of the ICE methodology, which for the most part this document merely maps to XMPP syntax.
+&xep0166; defines a framework for negotiating and managing out-of-band data sessions over XMPP. In order to provide a flexible framework, the base Jingle specification defines neither data transport methods nor content formats, leaving that up to separate specifications. The current document defines a transport method for establishing and managing data connections between XMPP entities, using the ICE methodology currently being developed within the IETF.
+The process for ICE negotiation is largely the same in Jingle as it is in &icecurr;. There are several differences:
Note: This document depends on the IETF's Interactive Connectivity Establishment (ICE) specification, which is a work in progress. Every effort has been made to keep this document synchronized with draft-ietf-mmusic-ice, for which the latest published version is 12 (hereafter referred to as "&icecur;"). The interested reader is referred to the &icecur; for a detailed description of the ICE methodology, which for the most part this document merely maps to XMPP syntax.
The Jingle transport method defined herein is designed to meet the following requirements:
@@ -77,22 +83,22 @@The reader is referred to &icecur; for a description of various terms used in the context of ICE. Those terms are not reproduced here.
+The reader is referred to &icecurr; for a description of various terms used in the context of ICE. Those terms are not reproduced here.
In order for the initiator in a Jingle exchange to start the negotiation, it MUST send a Jingle "session-initiate" stanza as described in XEP-0166. This stanza MUST include at least one transport method. If the initiator wishes to negotiate the ICE transport, it MUST include an empty &TRANSPORT; child element qualified by the 'http://jabber.org/protocol/jingle/transport/ice' namespace.
+In order for the initiator in a Jingle exchange to start the negotiation, it MUST send a Jingle "session-initiate" stanza as described in XEP-0166. This stanza MUST include at least one transport method. If the initiator wishes to negotiate the ICE transport, it MUST include an empty &TRANSPORT; child element qualified by the 'http://www.xmpp.org/extensions/xep-0176.html#ns' namespace (see Protocol Namespaces).
The following is an example of the candidate format:
The first step in negotiating connectivity is for each client to immediately begin sending candidate transport methods to the other client. These candidates SHOULD be gathered by following the procedure specified in Section 5.1 of &icecur; and prioritized by following the procedure specified in Section 5.2 of &icecur;. Each candidate MUST be sent in a &JINGLE; element with an action of "transport-info".
+The first step in negotiating connectivity is for each client to immediately begin sending candidate transport methods to the other client. These candidates SHOULD be gathered by following the procedure specified in Section 5.1 of &icecurr; and prioritized by following the procedure specified in Section 5.2 of &icecurr;. Each candidate MUST be sent in a &JINGLE; element with an action of "transport-info".
If the responder receives and can successfully process a given candidate, it returns an IQ-result (if not, for example because the candidate data is improperly formatted, it returns an error).
Note well that the responder is only indicating receipt of the candidate, not telling the initiator that the candidate will be used.
The initiator keeps sending candidates, one after the other (without stopping to receive an acknowledgement of receipt from the responder for each candidate) until it has exhausted its supply of possible or desirable candidate transports. (Because certain candidates may be more "expensive" in terms of bandwidth or processing power, the initiator may not want to advertise their existence unless necessary.) For each candidate, the responder acknowledges receipt.
At the same time (i.e., immediately after provisionally accepting the session, not waiting for the initiator to begin or finish sending candidates), the responder also begins sending candidates that may work for it. As above, the initiator acknowledges receipt of the candidates.
-As the initiator and responder receive candidates, they probe the various candidate transports for connectivity. In performing these connectivity checks, client SHOULD follow the procedure specified in Section 7 of &icecur;.
+As the initiator and responder receive candidates, they probe the various candidate transports for connectivity. In performing these connectivity checks, client SHOULD follow the procedure specified in Section 7 of &icecurr;.
If an entity supports this specification, it MUST return a feature of "http://jabber.org/protocol/jingle/transport/ice" in response to &xep0030; information requests.
+If an entity supports this specification, it MUST return a feature of "http://www.xmpp.org/extensions/xep-0176.html#ns" in response to &xep0030; information requests.
As mentioned in the Deployment Notes of this document, the administrator of an XMPP server may wish to deploy a STUN server in order to ease the process of negotiating use of the Jingle ICE transport. A client can become aware of a STUN server in the following ways:
The ®ISTRAR; shall include 'http://jabber.org/protocol/jingle/transport/ice' in its registry of protocol namespaces.
+Until this specification advances to a status of Draft, its associated namespace shall be "http://www.xmpp.org/extensions/xep-0176.html#ns"; upon advancement of this specification, the ®ISTRAR; shall issue a permanent namespace in accordance with the process defined in Section 4 of &xep0053;.
The XMPP Registrar shall include "http://jabber.org/protocol/jingle/transport/ice" in its registry of Jingle transport methods. The registry submission is as follows:
+The XMPP Registrar shall include "ice" in its registry of Jingle transport methods. The registry submission is as follows:
ice
@@ -445,8 +451,8 @@