From 11a38d91f44e878f82edab468bef0288cdb3b122 Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Sat, 3 Oct 2009 00:34:59 +0000
Subject: [PATCH] 0.12

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@3488 4b5297f7-1745-476d-ba37-a9c6900126ab
---
 xep-0181.xml | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/xep-0181.xml b/xep-0181.xml
index 15fbe9a2..7e4cd32d 100644
--- a/xep-0181.xml
+++ b/xep-0181.xml
@@ -23,6 +23,12 @@
   <shortname>NOT_YET_ASSIGNED</shortname>
   &stpeter;
   &seanegan;
+  <revision>
+    <version>0.12</version>
+    <date>2008-10-02</date>
+    <initials>psa</initials>
+    <remark><p>Corrected definitions and schema to make it clear that the code attribute contains one and only one character representing a DTMF tone.</p></remark>
+  </revision>
   <revision>
     <version>0.11</version>
     <date>2008-09-23</date>
@@ -120,7 +126,7 @@
     </tr>
     <tr>
       <td>code</td>
-      <td>The tone to be generated. The value of the 'code' attribute SHOULD be one the following characters: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, #, and * (however, the characters A, B, C, and D MAY be sent as well <note>Although A, B, C, and D were originally defined as part of DTMF, they were never deployed to telephony consumers and were used only for control purposes at private branch exchanges (PBXs) and central office operator stations; however, they are used in certain non-telephony applications of DTMF, such as ham radio.</note>).</td>
+      <td>A single-character code that identifies the tone to be generated. The value of the 'code' attribute SHOULD be one and only one the following characters: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, #, and * (however, the characters A, B, C, and D MAY be sent as well <note>Although A, B, C, and D were originally defined as part of DTMF, they were never deployed to telephony consumers and were used only for control purposes at private branch exchanges (PBXs) and central office operator stations; however, they are used in certain non-telephony applications of DTMF, such as ham radio.</note>).</td>
       <td>#</td>
       <td>REQUIRED</td>
     </tr>
@@ -168,18 +174,20 @@
     to='juliet@capulet.com/balcony'
     type='error'>
   <error type='cancel'>
-    <service-unavailable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+    <service-unavailable 
+      xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
   </error>
 </iq>
   ]]></example>
-  <p>If the receiving entity does not understand the specified code, it MUST return a &feature; stanza error.</p>
-  <example caption="Receiving does not understand code"><![CDATA[
+  <p>If the receiving entity supports this protocol but does not understand the specified code, it MUST return a &feature; stanza error.</p>
+  <example caption="Receiving entity does not understand code"><![CDATA[
 <iq from='ivr.shakespeare.lit'
     id='dtmf1'
     to='juliet@capulet.com/balcony'
     type='error'>
   <error type='cancel'>
-    <feature-not-implemented xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+    <feature-not-implemented 
+      xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
   </error>
 </iq>
   ]]></example>
@@ -190,14 +198,15 @@
     to='juliet@capulet.com/balcony'
     type='error'>
   <error type='cancel'>
-    <not-acceptable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+    <not-acceptable 
+      xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
   </error>
 </iq>
   ]]></example>
 </section1>
 
 <section1 topic='Determining Support' anchor='support'>
-  <p>If an entity supports Jingle DTMF (i.e., sending of DTMF in the XMPP signalling channel as specified herein), it MUST return a &xep0030; feature of "urn:xmpp:jingle:dtmf:0" in response to service discovery information requests.</p>
+  <p>If an entity supports sending of DTMF in the XMPP signalling channel as specified herein, it MUST return a &xep0030; feature of "urn:xmpp:jingle:dtmf:0" in response to service discovery information requests.</p>
   <p>In order for an application to determine whether an entity supports this protocol, where possible it SHOULD use the dynamic, presence-based profile of service discovery defined in &xep0115;. However, if an application has not received entity capabilities information from an entity, it SHOULD use explicit service discovery instead.</p>
 </section1>
 
@@ -253,7 +262,7 @@
 
   <xs:simpleType name="DTMFString">
     <xs:restriction base="xs:string">
-      <xs:pattern value="(#|\*|0|1|2|3|4|5|6|7|8|9|A|B|C|D)*" />
+      <xs:pattern value="(#|\*|0|1|2|3|4|5|6|7|8|9|A|B|C|D)" />
     </xs:restriction>
   </xs:simpleType>