Update to latest spec

23 files changed, 460 insertions, 104 deletions

diff --git a/spec/Account.xml b/spec/Account.xml
index 675ea8125..13b97f4b5 100644
--- a/spec/Account.xml
+++ b/spec/Account.xml
@@ -277,6 +277,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
         </ul>
 
+        <p>For the <tt>IRC</tt> protocol, the network name (<tt>freenode</tt>,
+          <tt>gimpnet</tt>, etc.) can be used if relevant.</p>
+
         <p>The <tp:member-ref>Icon</tp:member-ref> property SHOULD be set to a
           corresponding brand-specific icon name, if possible. In the future,
           this property may be used as an index into additional
diff --git a/spec/Call_Content.xml b/spec/Call_Content.xml
index ef08acc3b..f738a2891 100644
--- a/spec/Call_Content.xml
+++ b/spec/Call_Content.xml
@@ -20,8 +20,7 @@
       02110-1301, USA.</p>
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Call1.Content"
-      tp:causes-havoc="experimental">
+  <interface name="org.freedesktop.Telepathy.Call1.Content">
     <tp:added version="0.19.0">(draft 1)</tp:added>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
@@ -52,7 +51,7 @@
         arguments</tp:changed>
       <tp:docstring>
         Remove the content from the call. This will cause
-        <tp:member-ref>Removed</tp:member-ref>((self_handle,
+        <tp:dbus-ref namespace="ofdT.Channel.Type">Call1.ContentRemoved</tp:dbus-ref>((self_handle,
         <tp:value-ref type="Call_State_Change_Reason">User_Requested</tp:value-ref>, "", "")) to be
         emitted.
       </tp:docstring>
@@ -68,15 +67,6 @@
       </tp:possible-errors>
     </method>
 
-    <signal name="Removed" tp:name-for-bindings="Removed">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Emitted when the content is removed from the call. This
-          is the same as the <tp:dbus-ref
-          namespace="ofdT.Channel.Type">Call1.ContentRemoved</tp:dbus-ref>
-          signal.</p>
-      </tp:docstring>
-    </signal>
-
     <property name="Interfaces" tp:name-for-bindings="Interfaces"
       type="as" tp:type="DBus_Interface[]" access="read" tp:immutable="yes">
       <tp:added version="0.19.11"/>
diff --git a/spec/Call_Content_Interface_Audio_Control.xml b/spec/Call_Content_Interface_Audio_Control.xml
new file mode 100644
index 000000000..e21dae440
--- /dev/null
+++ b/spec/Call_Content_Interface_Audio_Control.xml
@@ -0,0 +1,110 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="/Call_Content_Interface_Audio_Control"
+  xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+  <tp:copyright>Copyright © 2009-2011 Collabora Ltd.</tp:copyright>
+  <tp:license xmlns="http://www.w3.org/1999/xhtml">
+    <p>This library is free software; you can redistribute it and/or
+      modify it under the terms of the GNU Lesser General Public
+      License as published by the Free Software Foundation; either
+      version 2.1 of the License, or (at your option) any later version.</p>
+
+    <p>This library is distributed in the hope that it will be useful,
+      but WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Lesser General Public License for more details.</p>
+
+    <p>You should have received a copy of the GNU Lesser General Public
+      License along with this library; if not, write to the Free Software
+      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+      02110-1301, USA.</p>
+  </tp:license>
+
+  <interface name="org.freedesktop.Telepathy.Call1.Content.Interface.AudioControl">
+    <tp:added version="0.25.1">(draft 1)</tp:added>
+    <tp:requires interface="org.freedesktop.Telepathy.Call1.Content.Interface.Media"/>
+    <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/>
+
+    <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+      <p>This interface allows the connection manager to be kept informed of,
+          and control, the input and output volumes of an audio stream.
+          While generally not needed, if the connection manager needs to
+          handle stream volumes directly (typically when using
+          <tp:value-ref>Call_Content_Packetization_Type_Raw</tp:value-ref>),
+          this interface may be necessary.</p>
+
+      <p>If this interface is present, the handler should call
+          <tp:member-ref>ReportInputVolume</tp:member-ref>
+          and <tp:member-ref>ReportOutputVolume</tp:member-ref> whenever the
+          input and output volume change, both when the user manually modifies
+          the volume and when the volumes are adjusted in response to
+          <tp:member-ref>RequestedInputVolume</tp:member-ref> and
+          <tp:member-ref>RequestedOutputVolume</tp:member-ref> changing.</p>
+
+      <p>The maximum volume as used in this interface represent the unamplified
+         hardware volume (0 dB). No software amplification should be used to
+         boost the signal to a higher level when this Interface is in use</p>
+    </tp:docstring>
+
+    <property name="RequestedInputVolume" tp:type="Audio_Control_Volume"
+      type="i" access="read" tp:name-for-bindings="Requested_Input_Volume">
+      <tp:docstring>
+        The input volume as requested by the Connection Manager.
+        Initially and on any changes the client should change its input volume
+        to match the requested volume.
+      </tp:docstring>
+    </property>
+
+    <method name="ReportInputVolume" tp:name-for-bindings="Report_Input_Volume">
+      <arg direction="in" name="Volume" tp:type="Audio_Control_Volume" type="i">
+        <tp:docstring>
+          Report the input volume level as set by the client.
+        </tp:docstring>
+      </arg>
+      <tp:docstring>
+        <p>Report to the CM that the Content input volume has been
+          changed by the client.</p>
+
+        <p>It is the client's responsibility to change the input volume used for
+           the content. However, the client MUST call this whenever it changes
+           input volume for the content.</p>
+      </tp:docstring>
+    </method>
+
+    <property name="RequestedOutputVolume" tp:type="Audio_Control_Volume"
+      type="i" access="read" tp:name-for-bindings="Requested_Output_Volume">
+      <tp:docstring>
+        The input volume as requested by the Connection Manager.
+        Initially and on any changes the client should change its input volume
+        to match the requested volume.
+      </tp:docstring>
+    </property>
+
+    <method name="ReportOutputVolume"
+        tp:name-for-bindings="Report_Output_Volume">
+      <arg direction="in" name="Volume" tp:type="Audio_Control_Volume" type="i">
+        <tp:docstring>
+          Report the output volume level as set by the client.
+        </tp:docstring>
+      </arg>
+      <tp:docstring>
+        <p>Report to the CM that the content output volume has been
+          changed by the client.</p>
+
+        <p>It is the client's responsibility to change the output volume used
+           for the content. However, the client MUST call this whenever it
+           changes output volume for the content.</p>
+      </tp:docstring>
+    </method>
+
+  <tp:simple-type name="Audio_Control_Volume" type="i">
+    <tp:docstring>
+      <p>A volume value either reported to or requested by the Connection
+         Manager. This value should either be -1 for an unknown value or in the
+         range of 0-255, with 0 being the minimal volume and 255 being the
+         highest unamplified volume the input or output is capable of (known
+         as 0 dB)
+      </p>
+    </tp:docstring>
+  </tp:simple-type>
+  </interface>
+</node>
diff --git a/spec/Call_Content_Interface_DTMF.xml b/spec/Call_Content_Interface_DTMF.xml
new file mode 100644
index 000000000..b7147afad
--- /dev/null
+++ b/spec/Call_Content_Interface_DTMF.xml
@@ -0,0 +1,229 @@
+<?xml version="1.0" ?>
+<node name="/Call_Content_Interface_DTMF" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+  <tp:copyright>Copyright © 2005-2010 Collabora Limited</tp:copyright>
+  <tp:copyright>Copyright © 2005-2010 Nokia Corporation</tp:copyright>
+  <tp:copyright>Copyright © 2006 INdT</tp:copyright>
+  <tp:license xmlns="http://www.w3.org/1999/xhtml">
+    <p>This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.</p>
+
+<p>This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.</p>
+
+<p>You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
+  </tp:license>
+  <interface name="org.freedesktop.Telepathy.Call1.Content.Interface.DTMF">
+    <tp:added version="0.UNRELEASED">(draft 1)</tp:added>
+    <tp:requires interface="org.freedesktop.Telepathy.Call1.Content"/>
+
+    <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+      An interface that gives audio Contents the ability to send DTMF events
+      which have been established using the Call1 channel
+      type. The event codes used are in common with those defined in <a
+      href="http://www.rfc-editor.org/rfc/rfc4733.txt">RFC4733</a>, and are
+      listed in the <tp:type>DTMF_Event</tp:type> enumeration.
+    </tp:docstring>
+
+    <method name="StartTone" tp:name-for-bindings="Start_Tone">
+      <arg direction="in" name="Event" type="y" tp:type="DTMF_Event">
+        <tp:docstring>A numeric event code from the DTMF_Event enum.</tp:docstring>
+      </arg>
+
+      <tp:docstring>
+        <p>Start sending a DTMF tone to all eligible streams in the channel.
+          Where possible, the tone will continue until
+          <tp:member-ref>StopTone</tp:member-ref> is called. On certain protocols,
+          it may only be possible to send events with a predetermined length. In
+          this case, the implementation MAY emit a fixed-length tone, and the
+          StopTone method call SHOULD return NotAvailable.</p>
+          <tp:rationale>
+            The client may wish to control the exact duration and timing of the
+            tones sent as a result of user's interaction with the dialpad, thus
+            starting and stopping the tone sending explicitly.
+          </tp:rationale>
+
+        <p>Tone overlaping or queueing is not supported, so this method can only
+          be called if no DTMF tones are already being played.</p>
+      </tp:docstring>
+      <tp:possible-errors>
+        <tp:error name="org.freedesktop.Telepathy.Error.NetworkError" />
+        <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument">
+          <tp:docstring>
+	    The event id was invalid.
+          </tp:docstring>
+        </tp:error>
+        <tp:error name="org.freedesktop.Telepathy.Error.ServiceBusy">
+          <tp:docstring>
+            DTMF tones are already being played.
+          </tp:docstring>
+        </tp:error>
+      </tp:possible-errors>
+    </method>
+
+    <method name="StopTone" tp:name-for-bindings="Stop_Tone">
+      <tp:docstring>
+        Stop sending any DTMF tones which have been started using the
+        <tp:member-ref>StartTone</tp:member-ref> or
+        <tp:member-ref>MultipleTones</tp:member-ref> methods.
+        If there is no current tone, this method will do nothing.
+        If MultipleTones was used, the client should not assume the
+        sending has stopped immediately; instead, the client should wait
+        for the StoppedTones signal.
+        <tp:rationale>
+          On some protocols it might be impossible to cancel queued tones
+          immediately.
+        </tp:rationale>
+      </tp:docstring>
+      <tp:possible-errors>
+        <tp:error name="org.freedesktop.Telepathy.Error.NetworkError" />
+        <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable">
+          <tp:docstring>
+            Continuous tones are not supported by this stream. Deprecated,
+            since stream IDs are ignored.
+          </tp:docstring>
+        </tp:error>
+      </tp:possible-errors>
+    </method>
+
+    <method name="MultipleTones" tp:name-for-bindings="Multiple_Tones">
+      <arg direction="in" name="Tones" type="s">
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+          <p>A string representation of one or more DTMF
+            events. Implementations of this method MUST support all of the
+            following characters in this string:</p>
+
+          <ul>
+            <li>the digits 0-9, letters A-D and a-d, and symbols '*' and '#'
+              correspond to the members of <tp:type>DTMF_Event</tp:type></li>
+
+            <li>any of 'p', 'P', 'x', 'X' or ',' (comma) results in an
+              implementation-defined pause, typically for 3 seconds</li>
+
+            <li>'w' or 'W' waits for the user to continue, by stopping
+              interpretation of the string, and if there is more to be played,
+              emitting the <tp:member-ref>TonesDeferred</tp:member-ref> signal
+              with the rest of the string as its argument: see that signal
+              for details</li>
+          </ul>
+        </tp:docstring>
+      </arg>
+      <tp:docstring>
+        <p>Send multiple DTMF events to all eligible streams in the channel.
+        Each tone will be played for an implementation-defined number of
+        milliseconds (typically 250ms), followed by a gap before the next tone
+        is played (typically 100ms). The
+        duration and gap are defined by the protocol or connection manager.</p>
+
+        <tp:rationale>
+          <p>In cases where the client knows in advance the tone sequence it
+            wants to send, it's easier to use this method than manually start
+            and stop each tone in the sequence.</p>
+
+          <p>The tone and gap lengths may need to vary for interoperability,
+            according to the protocol and other implementations' ability to
+            recognise tones. At the time of writing, GStreamer uses a
+            minimum of 250ms tones and 100ms gaps when playing in-band DTMF
+            in the normal audio stream, or 70ms tones and 50ms gaps when
+            encoding DTMF as <code>audio/telephone-event</code>.</p>
+        </tp:rationale>
+
+        <p>Tone overlaping or queueing is not supported, so this method can only
+          be called if no DTMF tones are already being played.</p>
+      </tp:docstring>
+      <tp:possible-errors>
+        <tp:error name="org.freedesktop.Telepathy.Error.NetworkError" />
+        <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument">
+          <tp:docstring>
+            The supplied Tones string was invalid.
+          </tp:docstring>
+        </tp:error>
+        <tp:error name="org.freedesktop.Telepathy.Error.ServiceBusy">
+          <tp:docstring>
+            DTMF tones are already being played.
+          </tp:docstring>
+        </tp:error>
+      </tp:possible-errors>
+    </method>
+
+    <property name="CurrentlySendingTones"
+        tp:name-for-bindings="Currently_Sending_Tones" type="b" access="read">
+      <tp:docstring>
+        Indicates whether there are DTMF tones currently being sent in the
+        channel. If so, the client should wait for
+        <tp:member-ref>StoppedTones</tp:member-ref> signal before trying to
+        send more tones.
+      </tp:docstring>
+    </property>
+
+    <property name="DeferredTones" tp:name-for-bindings="Deferred_Tones"
+        type="s" access="read">
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>The tones waiting for the user to continue, if any.</p>
+
+        <p>When this property is set to a non-empty value,
+          <tp:member-ref>TonesDeferred</tp:member-ref> is emitted.
+          When any tones are played (i.e. whenever
+          <tp:member-ref>SendingTones</tp:member-ref> is emitted),
+          this property is reset to the empty string.</p>
+      </tp:docstring>
+    </property>
+
+    <signal name="TonesDeferred" tp:name-for-bindings="Tones_Deferred">
+      <tp:added version="0.21.3" />
+      <arg name="Tones" type="s">
+        <tp:docstring>The new non-empty value of
+          <tp:member-ref>DeferredTones</tp:member-ref>.</tp:docstring>
+      </arg>
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>Emitted when 'w' or 'W', indicating "wait for the user to continue",
+          is encountered while playing a DTMF string queued by
+          <tp:member-ref>MultipleTones</tp:member-ref>. Any queued DTMF events
+          after the 'w', which have not yet been played, are placed in the
+          <tp:member-ref>DeferredTones</tp:member-ref> property and copied
+          into this signal's argument.</p>
+
+        <p>When the channel handler is ready to continue, it MAY pass the
+          value of <tp:member-ref>DeferredTones</tp:member-ref> to
+          <tp:member-ref>MultipleTones</tp:member-ref>, to resume sending.
+          Alternatively, it MAY ignore the deferred tones, or even play
+          different tones instead. Any deferred tones are discarded the next
+          time a tone is played.</p>
+
+        <p>This signal SHOULD NOT be emitted if there is nothing left to play,
+          i.e. if the 'w' was the last character in the DTMF string.</p>
+      </tp:docstring>
+    </signal>
+
+    <signal name="SendingTones" tp:name-for-bindings="Sending_Tones">
+      <arg name="Tones" type="s">
+        <tp:docstring>DTMF string (one or more events) that is to be played.
+        </tp:docstring>
+      </arg>
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>DTMF tone(s)are being sent to all eligible streams in the channel.
+        The signal is provided to indicating the fact that the streams are
+        currently being used to send one or more DTMF tones, so any other
+        media input is not getting through to the audio stream. It also
+        serves as a cue for the
+        <tp:member-ref>StopTone</tp:member-ref> method.</p>
+      </tp:docstring>
+    </signal>
+
+    <signal name="StoppedTones" tp:name-for-bindings="Stopped_Tones">
+      <arg name="Cancelled" type="b">
+        <tp:docstring>True if the DTMF tones were actively cancelled via
+          <tp:member-ref>StopTone</tp:member-ref>.</tp:docstring>
+      </arg>
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>DTMF tones have finished playing on streams in this channel.</p>
+      </tp:docstring>
+    </signal>
+  </interface>
+</node>
+<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/spec/Call_Content_Interface_Media.xml b/spec/Call_Content_Interface_Media.xml
index ca5ed36bf..fe053e2b9 100644
--- a/spec/Call_Content_Interface_Media.xml
+++ b/spec/Call_Content_Interface_Media.xml
@@ -21,8 +21,7 @@
   </tp:license>
 
   <interface
-      name="org.freedesktop.Telepathy.Call1.Content.Interface.Media"
-      tp:causes-havoc="experimental">
+      name="org.freedesktop.Telepathy.Call1.Content.Interface.Media">
     <tp:added version="0.23.4">(draft 2)</tp:added>
     <tp:requires interface="org.freedesktop.Telepathy.Call1.Content"/>
 
@@ -225,11 +224,6 @@
           >MediaDescription</tp:dbus-ref>
         </tp:docstring>
       </tp:member>
-      <tp:member name="Remote_Contact" type="u" tp:type="Contact_Handle">
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          The contact handle that this description applies to.
-        </tp:docstring>
-      </tp:member>
       <tp:member name="Properties" type="a{sv}"
            tp:type="Media_Description_Properties">
         <tp:docstring>
@@ -256,15 +250,6 @@
         Otherwise, only parameters which strictly describe the media being sent
         can be changed.
       </tp:docstring>
-      <arg name="Remote_Contact" type="u" tp:type="Handle" direction="in">
-        <tp:docstring>
-          The remote contact that this description should be negotiated with
-          (or 0 to mean "negotiate this with everyone"). Note that encoding
-          the same video multiple times is often needlessly expensive, so
-          differences in MediaDescriptions negotiated with different parties
-          in the call should be limited to payloading parameters if possible.
-        </tp:docstring>
-      </arg>
       <arg name="MediaDescription" direction="in" type="a{sv}"
            tp:type="Media_Description_Properties">
         <tp:docstring>
@@ -341,11 +326,6 @@
           previous media description.
         </tp:docstring>
       </arg>
-      <arg name="Contact" type="u">
-        <tp:docstring>
-          The remote contact the media description belongs to.
-        </tp:docstring>
-      </arg>
       <arg name="Properties" type="a{sv}"
            tp:type="Media_Description_Properties">
         <tp:docstring>
@@ -383,13 +363,6 @@
         </p>
       </tp:docstring>
 
-      <arg name="Remote_Contact" type="u" tp:type="Handle">
-        <tp:docstring>
-          The remote contact that this description was negotiated with
-          (or 0 to mean "negotiated with everyone").
-        </tp:docstring>
-      </arg>
-
       <arg name="Updated_Media_Description" type="a{sv}"
         tp:type="Media_Description_Properties">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
@@ -440,7 +413,7 @@
 
     <property name="MediaDescriptionOffer"
         tp:name-for-bindings="Media_Description_Offer"
-      type="(oua{sv})" tp:type="Media_Description_Offer" access="read">
+      type="(oa{sv})" tp:type="Media_Description_Offer" access="read">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The object path to the current
           <tp:dbus-ref namespace="ofdT.Call1.Content"
diff --git a/spec/Call_Content_Interface_Video_Control.xml b/spec/Call_Content_Interface_Video_Control.xml
index 086d47581..992dc2301 100644
--- a/spec/Call_Content_Interface_Video_Control.xml
+++ b/spec/Call_Content_Interface_Video_Control.xml
@@ -19,8 +19,7 @@
       02110-1301, USA.</p>
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Call1.Content.Interface.VideoControl"
-    tp:causes-havoc="experimental">
+  <interface name="org.freedesktop.Telepathy.Call1.Content.Interface.VideoControl">
     <tp:added version="0.21.10">(draft 1)</tp:added>
     <tp:requires interface="org.freedesktop.Telepathy.Call1.Content.Interface.Media"/>
 
diff --git a/spec/Call_Content_Media_Description.xml b/spec/Call_Content_Media_Description.xml
index 7c494a410..6ed7d08ad 100644
--- a/spec/Call_Content_Media_Description.xml
+++ b/spec/Call_Content_Media_Description.xml
@@ -20,8 +20,7 @@
       02110-1301, USA.</p>
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Call1.Content.MediaDescription"
-      tp:causes-havoc="experimental">
+  <interface name="org.freedesktop.Telepathy.Call1.Content.MediaDescription">
     <tp:added version="0.23.4">(draft 1)</tp:added>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
@@ -69,7 +68,7 @@
         Reject the proposed update to the remote description.
       </tp:docstring>
       <arg name="Reason" type="(uuss)" tp:type="Call_State_Reason"
-        direction="out">
+        direction="in">
         <tp:docstring>
           A structured reason for the rejection.
         </tp:docstring>
diff --git a/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml b/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml
index f973306cb..ec1352eb9 100644
--- a/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml
+++ b/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml
@@ -18,8 +18,7 @@ License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPExtendedReports"
-    tp:causes-havoc="experimental">
+  <interface name="org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPExtendedReports">
     <tp:added version="0.23.4">(draft version, not API-stable)</tp:added>
     <tp:requires
     interface="org.freedesktop.Telepathy.Call1.Content.MediaDescription"/>
diff --git a/spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml b/spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml
index f586fe4c2..b3d473616 100644
--- a/spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml
+++ b/spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml
@@ -18,8 +18,7 @@ License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPFeedback"
-    tp:causes-havoc="experimental">
+  <interface name="org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPFeedback">
     <tp:added version="0.23.4">(draft version, not API-stable)</tp:added>
     <tp:requires interface="org.freedesktop.Telepathy.Call1.Content.MediaDescription"/>
 
diff --git a/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml b/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml
index a35615add..0f0a5b192 100644
--- a/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml
+++ b/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml
@@ -18,8 +18,7 @@ License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTPHeaderExtensions"
-    tp:causes-havoc="experimental">
+  <interface name="org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTPHeaderExtensions">
     <tp:added version="0.23.4">(draft version, not API-stable)</tp:added>
     <tp:requires interface="org.freedesktop.Telepathy.Call1.Content.MediaDescription"/>
 
diff --git a/spec/Call_Stream.xml b/spec/Call_Stream.xml
index b8b347d48..5f1321eb6 100644
--- a/spec/Call_Stream.xml
+++ b/spec/Call_Stream.xml
@@ -20,8 +20,7 @@
       02110-1301, USA.</p>
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Call1.Stream"
-      tp:causes-havoc="experimental">
+  <interface name="org.freedesktop.Telepathy.Call1.Stream">
     <tp:added version="0.19.0">(draft 1)</tp:added>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Call_Stream_Endpoint.xml b/spec/Call_Stream_Endpoint.xml
index 2aa7e52f3..b03a1547c 100644
--- a/spec/Call_Stream_Endpoint.xml
+++ b/spec/Call_Stream_Endpoint.xml
@@ -20,8 +20,7 @@
       02110-1301, USA.</p>
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Call1.Stream.Endpoint"
-    tp:causes-havoc="experimental">
+  <interface name="org.freedesktop.Telepathy.Call1.Stream.Endpoint">
     <tp:added version="0.19.0">(draft 1)</tp:added>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
@@ -340,7 +339,12 @@
     <property name="Transport" tp:name-for-bindings="Transport"
       type="u" tp:type="Stream_Transport_Type" access="read">
       <tp:docstring>
-        The transport type for the stream endpoint.
+        The transport type for the stream endpoint. This can be
+        different from the transport of the Stream in the case where
+        of falling back from <tp:value-ref
+        type="Stream_Transport_Type">ICE</tp:value-ref> to
+        <tp:value-ref
+        type="Stream_Transport_Type">Raw_UDP</tp:value-ref>.
       </tp:docstring>
     </property>
 
diff --git a/spec/Call_Stream_Interface_Media.xml b/spec/Call_Stream_Interface_Media.xml
index 450d5ea42..06c24ff43 100644
--- a/spec/Call_Stream_Interface_Media.xml
+++ b/spec/Call_Stream_Interface_Media.xml
@@ -20,8 +20,7 @@
       02110-1301, USA.</p>
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Call1.Stream.Interface.Media"
-      tp:causes-havoc="experimental">
+  <interface name="org.freedesktop.Telepathy.Call1.Stream.Interface.Media">
     <tp:added version="0.19.0">(draft 1)</tp:added>
     <tp:requires interface="org.freedesktop.Telepathy.Call1.Stream"/>
 
@@ -80,17 +79,16 @@
           data, and everything is going swimmingly.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="Pending_Pause" value="4">
+      <tp:enumvalue suffix="Pending_Mute" value="4">
         <tp:docstring>
-          The streaming implementation has been told to pause sending or
-          displaying data, but it has not yet indicated that it has done so.
+          The streaming implementation has been told to mute sending,
+          but it has not yet indicated that it has done so.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="Paused" value="5">
+      <tp:enumvalue suffix="Muted" value="5">
         <tp:docstring>
-          The streaming implementation has successfully paused either sending or
-          displaying data, and the local user's privacy or peace-and-quiet is
-          protected.
+          The streaming implementation has successfully muted sending,
+          and the local user's privacy is protected.
         </tp:docstring>
       </tp:enumvalue>
     </tp:enum>
@@ -215,7 +213,7 @@
     <method name="ReportReceivingFailure"
         tp:name-for-bindings="Report_Receiving_Failure">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        Can be called at any point to indicate a failure in the outgoing
+        Can be called at any point to indicate a failure in the incoming
         portion of the stream.
       </tp:docstring>
       <arg name="Reason" type="u" tp:type="Call_State_Change_Reason"
diff --git a/spec/Channel.xml b/spec/Channel.xml
index 11d3e509c..e0fa76594 100644
--- a/spec/Channel.xml
+++ b/spec/Channel.xml
@@ -102,7 +102,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
           MUST be present and not Handle_Type_None, and
           <tp:member-ref>TargetID</tp:member-ref> MUST NOT be
           present. Properties from
-          <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Interface">Addressing.DRAFT</tp:dbus-ref>
+          <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Interface">Addressing1</tp:dbus-ref>
           MUST NOT be present.</p>
 
         <p>The channel that satisfies the request MUST either:</p>
@@ -150,7 +150,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
           MUST be present and not Handle_Type_None, and
           <tp:member-ref>TargetHandle</tp:member-ref> MUST NOT be
           present. Properties from
-          <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Interface">Addressing.DRAFT</tp:dbus-ref>
+          <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Interface">Addressing1</tp:dbus-ref>
           MUST NOT be present.The request MUST fail with error InvalidHandle,
           without side-effects, if the requested TargetID would not be
           accepted by
diff --git a/spec/Channel_Interface_Addressing.xml b/spec/Channel_Interface_Addressing.xml
index 494fd7bf0..2524ac7f6 100644
--- a/spec/Channel_Interface_Addressing.xml
+++ b/spec/Channel_Interface_Addressing.xml
@@ -16,7 +16,7 @@ Lesser General Public License for more details.</p>
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
   </tp:license>
-  <interface name="org.freedesktop.Telepathy.Channel.Interface.Addressing.DRAFT"
+  <interface name="org.freedesktop.Telepathy.Channel.Interface.Addressing1"
              tp:causes-havoc="experimental">
     <tp:added version="0.19.12">(as draft)</tp:added>
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Channel_Interface_DTMF.xml b/spec/Channel_Interface_DTMF.xml
index bb579a113..e328d67c4 100644
--- a/spec/Channel_Interface_DTMF.xml
+++ b/spec/Channel_Interface_DTMF.xml
@@ -23,11 +23,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.StreamedMedia"/>
       <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.Call1"/>
     </tp:xor-requires>
+
+    <tp:changed version="0.UNRELEASED">The only part of this spec that should
+    be used with a Call1 channel is the "InitialTones" property.
+    </tp:changed>
+
     <tp:changed version="0.19.6">The <tp:type>Stream_ID</tp:type>s in this
-      interface should now be ignored by CMs. This is primarily to allow this
-      interface to be used with <tp:dbus-ref
-      namespace='ofdT.Channel.Type'>Call1</tp:dbus-ref>
-      channels.</tp:changed>
+      interface can now be ignored by CMs.
+    </tp:changed>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       An interface that gives a Channel the ability to send DTMF events over
@@ -207,7 +210,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </property>
 
     <property name="InitialTones" tp:name-for-bindings="Initial_Tones"
-        type="s" access="read">
+        type="s" access="read" tp:immutable="yes" tp:requestable="yes">
       <tp:added version="0.19.6" />
       <tp:docstring>
         <p>If non-empty in a channel request that will create a new channel,
@@ -215,6 +218,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
           at least one eligible audio stream has been created in the
           channel.</p>
 
+        <p>This should only be used with InitialAudio=true.</p>
+
         <p>This property is immutable (cannot change).</p>
       </tp:docstring>
     </property>
diff --git a/spec/Channel_Type_Call.xml b/spec/Channel_Type_Call.xml
index 0ea1319c6..d151988ad 100644
--- a/spec/Channel_Type_Call.xml
+++ b/spec/Channel_Type_Call.xml
@@ -17,8 +17,7 @@ You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
   </tp:license>
-  <interface name="org.freedesktop.Telepathy.Channel.Type.Call1"
-      tp:causes-havoc="experimental">
+  <interface name="org.freedesktop.Telepathy.Channel.Type.Call1">
     <tp:added version="0.19.0">(draft 1)</tp:added>
 
     <tp:requires interface="org.freedesktop.Telepathy.Channel"/>
@@ -111,7 +110,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         something. When the CM has information indicating that the remote contact has been
         notified about the call (or immediately if the network is known not to convey such
         information) it should also change to
-        <tp:value-ref type="Call_State">Ringing</tp:value-ref>. All changes to
+        <tp:value-ref type="Call_State">Initialised</tp:value-ref>. All changes to
         the <tp:member-ref>CallState</tp:member-ref> property are signalled using
         the <tp:member-ref>CallStateChanged</tp:member-ref> signal.</p>
 
@@ -324,7 +323,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           channel's <tp:dbus-ref namespace="ofdT.Channel">Requested</tp:dbus-ref>
           property is False, and
           the <tp:member-ref>CallState</tp:member-ref> is
-          <tp:value-ref type="Call_State">Ringing</tp:value-ref> (an incoming
+          <tp:value-ref type="Call_State">Initialised</tp:value-ref> (an incoming
           call is ready and waiting for the user to be notified). Calling this method
           SHOULD set <tp:member-ref>CallFlags</tp:member-ref>' bit
           <tp:value-ref type="Call_Flags">Locally_Ringing</tp:value-ref>, and notify the
@@ -346,7 +345,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable">
           <tp:docstring>
             The call is no longer in state
-            <tp:value-ref type="Call_State">Ringing</tp:value-ref>.
+            <tp:value-ref type="Call_State">Initialised</tp:value-ref>.
           </tp:docstring>
         </tp:error>
       </tp:possible-errors>
@@ -363,7 +362,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           property is False, and
           the <tp:member-ref>CallState</tp:member-ref> is
           <tp:value-ref type="Call_State">Initialising</tp:value-ref> or
-          <tp:value-ref type="Call_State">Ringing</tp:value-ref>. Calling this method
+          <tp:value-ref type="Call_State">Initialised</tp:value-ref>. Calling this method
           SHOULD set <tp:member-ref>CallFlags</tp:member-ref>' bit
           <tp:value-ref type="Call_Flags">Locally_Queued</tp:value-ref>, and notify the
           remote contact that the call is in a queue (if the
@@ -380,13 +379,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument">
           <tp:docstring>
             The call was <tp:dbus-ref namespace="ofdT.Channel"
-            >Requested</tp:dbus-ref>, so ringing does not make sense.
+            >Requested</tp:dbus-ref>, so queueing does not make sense.
           </tp:docstring>
         </tp:error>
         <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable">
           <tp:docstring>
             The call is no longer in state
-            <tp:value-ref type="Call_State">Initialising</tp:value-ref> or _Ringing.
+            <tp:value-ref type="Call_State">Initialising</tp:value-ref> or
+            <tp:value-ref type="Call_State">Initialised</tp:value-ref>.
           </tp:docstring>
         </tp:error>
       </tp:possible-errors>
@@ -395,7 +395,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     <method name="Accept" tp:name-for-bindings="Accept">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>For incoming calls in state
-          <tp:value-ref type="Call_State">Ringing</tp:value-ref>, accept the incoming call.
+          <tp:value-ref type="Call_State">Initialised</tp:value-ref>, accept the incoming call.
           This changes the <tp:member-ref>CallState</tp:member-ref> to
           <tp:value-ref type="Call_State">Accepted</tp:value-ref>.</p>
 
@@ -603,18 +603,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         <ul>
           <li>Pending_Initiator → Initialising (for outgoing calls,
             when <tp:member-ref>Accept</tp:member-ref> is called)</li>
-          <li>Initialising → Ringing (for outgoing calls, when
+          <li>Initialising → Initialised (for outgoing calls, when
             the remote client indicates that the user has been notified about
             the call. If the network is known not to provide feedback about whether
             the remote side is ringing, then the call should immediately be
             set to Ringing.</li>
-          <li>Initialising → Ringing (for incoming calls, when e.g. the
+          <li>Initialising → Initialised (for incoming calls, when e.g. the
             implementation has been initialised far enough that it is sensible
             to notify the user about the call (to reduce the probability that
             the user will pick up the call and have it immediately fail).
             The UI should then alert the user about the call, and call
             <tp:member-ref>SetRinging</tp:member-ref>)</li>
-          <li>Ringing → Accepted (for outgoing calls to a contact,
+          <li>Initialised → Accepted (for outgoing calls to a contact,
             when the remote contact accepts the call; for incoming calls, when
             <tp:member-ref>Accept</tp:member-ref> is called.)</li>
           <li>Accepted → Active (when the local user successfully
@@ -664,7 +664,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           this state.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="Ringing" value="3">
+      <tp:enumvalue suffix="Initialised" value="3">
         <tp:docstring>
           In the outgoing case: at least one called user has been alerted
           about the call (a SIP 180 (Ringing) packet or equivalent has been
@@ -756,7 +756,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           loggers can tell whether the call got as far as alerting the user,
           or whether something went wrong before then). It should be set when
           the SetRinging is called, and unset when the call leaves
-          <tp:value-ref type="Call_State">Ringing</tp:value-ref>.
+          <tp:value-ref type="Call_State">Initialised</tp:value-ref>.
         </tp:docstring>
       </tp:flag>
 
@@ -765,7 +765,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           This flag exists for observability of the
           <tp:member-ref>SetQueued</tp:member-ref> method. It should be set
           when the SetQueued is called, and unset when the call leaves
-          <tp:value-ref type="Call_State">Ringing</tp:value-ref>.
+          <tp:value-ref type="Call_State">Initialising</tp:value-ref> or
+          <tp:value-ref type="Call_State">Initialised</tp:value-ref>.
         </tp:docstring>
       </tp:flag>
 
@@ -930,7 +931,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         <tp:added version="0.21.2"/>
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           <p>The <tp:member-ref>CallState</tp:member-ref> changed from
-            <tp:value-ref type="Call_State">Ringing</tp:value-ref> or
+            <tp:value-ref type="Call_State">Initialised</tp:value-ref> or
             <tp:value-ref type="Call_State">Ended</tp:value-ref> (or a content's direction
             changed) because it was rejected by the remote user.</p>
           <p>Corresponds to <tp:error-ref>Rejected</tp:error-ref></p>
@@ -941,7 +942,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         <tp:added version="0.21.2"/>
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           <p>The <tp:member-ref>CallState</tp:member-ref> changed from
-            <tp:value-ref type="Call_State">Ringing</tp:value-ref> or
+            <tp:value-ref type="Call_State">Initialised</tp:value-ref> or
             <tp:value-ref type="Call_State">Ended</tp:value-ref> because the initiator
             ended the call before the receiver accepted it. With an
             incoming call this state change reason signifies a missed
@@ -976,7 +977,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         <tp:added version="0.21.2"/>
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           <p>The <tp:member-ref>CallState</tp:member-ref> changed from
-            <tp:value-ref type="Call_State">Ringing</tp:value-ref>
+            <tp:value-ref type="Call_State">Initialised</tp:value-ref>
             <tp:value-ref type="Call_State">Ended</tp:value-ref> because the receiver is busy
             (e.g. is already engaged in another call, and has not placed the
             initiator in a call-waiting queue).</p>
diff --git a/spec/Connection_Interface_Addressing.xml b/spec/Connection_Interface_Addressing.xml
index ef9df3eee..fe3783c2e 100644
--- a/spec/Connection_Interface_Addressing.xml
+++ b/spec/Connection_Interface_Addressing.xml
@@ -16,12 +16,14 @@
       along with this library; if not, write to the Free Software Foundation,
       Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
   </tp:license>
-  <interface name="org.freedesktop.Telepathy.Connection.Interface.Addressing.DRAFT"
+  <interface name="org.freedesktop.Telepathy.Connection.Interface.Addressing1"
              tp:causes-havoc="experimental">
     <tp:requires interface="org.freedesktop.Telepathy.Connection"/>
     <tp:requires interface="org.freedesktop.Telepathy.Connection.Interface.Contacts"/>
     <tp:added version="0.19.12">(as draft)</tp:added>
     <tp:changed version="0.25.1">Both methods now return two dictionaries.</tp:changed>
+    <tp:changed version="0.25.UNRELEASED">Replaced DRAFT with a version number
+      (still keeping the causes-havoc annotation)</tp:changed>
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>This interface deals with the multiple address types that can
       refer to the same contact, such as vCard fields and URIs.</p>
diff --git a/spec/Connection_Interface_Contact_List.xml b/spec/Connection_Interface_Contact_List.xml
index 033c64d1d..66834da97 100644
--- a/spec/Connection_Interface_Contact_List.xml
+++ b/spec/Connection_Interface_Contact_List.xml
@@ -841,6 +841,35 @@
       </tp:docstring>
     </property>
 
+    <property name="DownloadAtConnection" type="b" access="read"
+      tp:name-for-bindings="Download_At_Connection"
+      tp:is-connection-parameter='yes'>
+      <tp:added version="0.UNRELEASED"/>
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>If true, the contact list is automatically downloaded at
+          connection. If false, the contact list is only downloaded
+          when requested explicitely with
+          <tp:member-ref>Download</tp:member-ref>.</p>
+
+        <tp:rationale>
+          <p>Downloading the contact list uses bandwidth and is not always
+            necessary or desired. For example, a client could cache the
+            contact list from previous connections and accept less regular
+            updates, it could get the contact list from an out-of-band
+            protocol-specific way, or it could not need the contact list at
+            all.</p>
+        </tp:rationale>
+
+        <p>Connection managers MUST default to true.</p>
+
+        <tp:rationale>
+          <p>If a connection manager starts supporting this property but
+            defaults to false, it would break all existing clients that don't
+            call <tp:member-ref>Download</tp:member-ref>.</p>
+        </tp:rationale>
+      </tp:docstring>
+    </property>
+
     <method name="AuthorizePublication"
       tp:name-for-bindings="Authorize_Publication">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
@@ -1080,6 +1109,21 @@
       </tp:possible-errors>
     </method>
 
+    <method name="Download" tp:name-for-bindings="Download">
+      <tp:added version="0.UNRELEASED"/>
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>Download the contact list from the server. If
+          <tp:member-ref>DownloadAtConnection</tp:member-ref> is true,
+          Download does nothing.</p>
+      </tp:docstring>
+
+      <tp:possible-errors>
+        <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/>
+        <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/>
+        <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"/>
+      </tp:possible-errors>
+    </method>
+
   </interface>
 </node>
 <!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/spec/Makefile.am b/spec/Makefile.am
index d71537188..5b94e0760 100644
--- a/spec/Makefile.am
+++ b/spec/Makefile.am
@@ -9,7 +9,9 @@ EXTRA_DIST = \
     Account_Manager_Interface_Hidden.xml \
     Authentication_TLS_Certificate.xml \
     Call_Content.xml \
+    Call_Content_Interface_DTMF.xml \
     Call_Content_Interface_Media.xml \
+    Call_Content_Interface_Audio_Control.xml \
     Call_Content_Interface_Video_Control.xml \
     Call_Content_Media_Description.xml \
     Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml \
diff --git a/spec/Protocol.xml b/spec/Protocol.xml
index f779492f3..6cc10aa63 100644
--- a/spec/Protocol.xml
+++ b/spec/Protocol.xml
@@ -235,7 +235,7 @@ allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy
           both be represented by any single vCard field. Arbitrary
           handles/identifiers as vCard fields are represented
           through the Connection's
-          <tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface">Addressing.DRAFT</tp:dbus-ref>
+          <tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface">Addressing1</tp:dbus-ref>
           contact attributes.</p>
 
         <tp:rationale>
diff --git a/spec/Protocol_Interface_Addressing.xml b/spec/Protocol_Interface_Addressing.xml
index 0c62e1bd9..55ee71cb0 100644
--- a/spec/Protocol_Interface_Addressing.xml
+++ b/spec/Protocol_Interface_Addressing.xml
@@ -145,9 +145,9 @@ AddressableURISchemes=tel;sip;
           <dt><code>msnim</code></dt>
           <dd>For the purposes of
             <tp:dbus-ref namespace="org.freedesktop.Telepathy">Protocol.Interface.Addressing</tp:dbus-ref>,
-            <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Addressing.DRAFT</tp:dbus-ref>,
+            <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Addressing1</tp:dbus-ref>,
             and
-            <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Interface.Addressing.DRAFT</tp:dbus-ref>,
+            <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Interface.Addressing1</tp:dbus-ref>,
             the verb part is ignored, and SHOULD be <code>add</code>; the
             <code>contact</code> field in the query string is used to
             identify the contact.
@@ -155,9 +155,9 @@ AddressableURISchemes=tel;sip;
           <dt><code>aim</code></dt>
           <dd>For the purposes of
             <tp:dbus-ref namespace="org.freedesktop.Telepathy">Protocol.Interface.Addressing</tp:dbus-ref>,
-            <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Addressing.DRAFT</tp:dbus-ref>,
+            <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Addressing1</tp:dbus-ref>,
             and
-            <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Interface.Addressing.DRAFT</tp:dbus-ref>,
+            <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Interface.Addressing1</tp:dbus-ref>,
             the verb part is ignored, and SHOULD be <code>addbuddy</code>; the
             <code>screenname</code> field in the query string is used to
             identify the contact.
@@ -168,9 +168,9 @@ AddressableURISchemes=tel;sip;
           <dt><code>ymsgr</code></dt>
           <dd>For the purposes of
             <tp:dbus-ref namespace="org.freedesktop.Telepathy">Protocol.Interface.Addressing</tp:dbus-ref>,
-            <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Addressing.DRAFT</tp:dbus-ref>,
+            <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Addressing1</tp:dbus-ref>,
             and
-            <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Interface.Addressing.DRAFT</tp:dbus-ref>,
+            <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Interface.Addressing1</tp:dbus-ref>,
             the verb part is ignored, and SHOULD be <code>addfriend</code>; the
             query string is used to identify the contact.
             For example: <code>ymsgr:addfriend?julien</code>.</dd>
@@ -186,7 +186,7 @@ AddressableURISchemes=tel;sip;
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Attempt to normalize the given vCard address. Where possible, this
           SHOULD return an address that would appear in the
-          <code>org.freedesktop.Telepathy.Connection.Interface.Addressing.DRAFT/addresses</code>
+          <code>org.freedesktop.Telepathy.Connection.Interface.Addressing1/addresses</code>
           attribute for a contact on a connected
           <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection</tp:dbus-ref>.
         </p>
@@ -247,7 +247,7 @@ AddressableURISchemes=tel;sip;
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Attempt to normalize the given contact URI. Where possible, this
           SHOULD return an address that would appear in the
-          <code>org.freedesktop.Telepathy.Connection.Interface.Addressing.DRAFT/uris</code>
+          <code>org.freedesktop.Telepathy.Connection.Interface.Addressing1/uris</code>
           attribute for a contact on a connected
           <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection</tp:dbus-ref>.
         </p>
diff --git a/spec/all.xml b/spec/all.xml
index 7e8c83423..72e4c4916 100644
--- a/spec/all.xml
+++ b/spec/all.xml
@@ -3,7 +3,7 @@
   xmlns:xi="http://www.w3.org/2001/XInclude">
 
 <tp:title>Telepathy D-Bus Interface Specification</tp:title>
-<tp:version>0.25.1</tp:version>
+<tp:version>0.25.1.1</tp:version>
 
 <tp:copyright>Copyright © 2005-2011 Collabora Limited</tp:copyright>
 <tp:copyright>Copyright © 2005-2011 Nokia Corporation</tp:copyright>
@@ -241,6 +241,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
    <xi:include href="Call_Content.xml"/>
    <xi:include href="Call_Content_Interface_Media.xml"/>
    <xi:include href="Call_Interface_Mute.xml"/>
+   <xi:include href="Call_Content_Interface_DTMF.xml"/>
    <xi:include href="Call_Content_Interface_Video_Control.xml"/>
    <xi:include href="Call_Content_Interface_Audio_Control.xml"/>
    <xi:include href="Call_Content_Media_Description.xml"/>