Update to spec 0.19.7

- update spec/ directory
- add WouldBreakAnonymity error to errors.h and documentation
- add Chat_State_Map type to documentation
- add Account.ConnectionError, Account.ConnectionErrorDetails,
  ChatState.ChatStates properties to documentation

10 files changed, 231 insertions, 75 deletions

diff --git a/spec/Account.xml b/spec/Account.xml
index f315c15d9..dfc37bc58 100644
--- a/spec/Account.xml
+++ b/spec/Account.xml
@@ -442,6 +442,58 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:docstring>
     </property>
 
+    <property name="ConnectionError" tp:name-for-bindings="Connection_Error"
+      access="read" type="s" tp:type="DBus_Error_Name">
+      <tp:added version="0.19.7"/>
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>If the last connection to this account failed with an error,
+          the D-Bus error name of that error; otherwise, the empty string.
+          The account manager is expected to set this by observing the
+          <tp:dbus-ref namespace="org.freedesktop.Telepathy"
+            >Connection.ConnectionError</tp:dbus-ref> and
+          <tp:dbus-ref namespace="org.freedesktop.Telepathy"
+            >Connection.StatusChanged</tp:dbus-ref>
+          signals.</p>
+
+        <p>If ConnectionError is received before the connection disconnects,
+          its first argument should be used to set this property;
+          otherwise, the Reason argument of StatusChanged should be converted
+          to a suitable D-Bus error name.</p>
+
+        <p>Whenever the Connection connects successfully, this property should
+          be reset to the empty string.</p>
+
+        <tp:rationale>
+          <p>This combines the state-recoverability of
+            <tp:member-ref>ConnectionStatusReason</tp:member-ref> with the
+            extensibility of Connection.ConnectionError.</p>
+        </tp:rationale>
+      </tp:docstring>
+    </property>
+
+    <property name="ConnectionErrorDetails"
+      tp:name-for-bindings="Connection_Error_Details"
+      access="read" type="a{sv}" tp:type="String_Variant_Map">
+      <tp:added version="0.19.7"/>
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>If the last connection to this account failed with an error,
+          a mapping representing any additional information about the last
+          disconnection; otherwise, the empty map. The keys and values are
+          the same as for the second argument of
+          <tp:dbus-ref namespace="org.freedesktop.Telepathy"
+            >Connection.ConnectionError</tp:dbus-ref>.</p>
+
+        <p>Whenever the Connection connects successfully, this property should
+          be reset to the empty map.</p>
+
+        <tp:rationale>
+          <p>This combines the state-recoverability of
+            <tp:member-ref>ConnectionStatusReason</tp:member-ref> with the
+            extensibility of Connection.ConnectionError.</p>
+        </tp:rationale>
+      </tp:docstring>
+    </property>
+
     <property name="CurrentPresence" type="(uss)" access="read"
       tp:type="Simple_Presence" tp:name-for-bindings="Current_Presence">
       <tp:docstring>
diff --git a/spec/Channel_Interface_Anonymity.xml b/spec/Channel_Interface_Anonymity.xml
index 7477f9637..ef3a3b85d 100644
--- a/spec/Channel_Interface_Anonymity.xml
+++ b/spec/Channel_Interface_Anonymity.xml
@@ -21,13 +21,13 @@
       02110-1301, USA.</p>
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Channel.Interface.Anonymity.DRAFT"
-    tp:causes-havoc="experimental">
-    <tp:added version="0.19.6">(draft version, not API-stable)</tp:added>
+  <interface name="org.freedesktop.Telepathy.Channel.Interface.Anonymity">
+    <tp:added version="0.19.7">(as stable API)</tp:added>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>Interface for requesting the anonymity modes of a channel
-      (as defined in Connection.Interface.Anonymity.DRAFT).</p>
+        (as defined in <tp:dbus-ref namespace="org.freedesktop.Telepathy"
+          >Connection.Interface.Anonymity</tp:dbus-ref>).</p>
     </tp:docstring>
 
     <property name="AnonymityModes" type="u" tp:type="Anonymity_Mode_Flags"
diff --git a/spec/Channel_Interface_Chat_State.xml b/spec/Channel_Interface_Chat_State.xml
index 89ad6da17..27515d2e8 100644
--- a/spec/Channel_Interface_Chat_State.xml
+++ b/spec/Channel_Interface_Chat_State.xml
@@ -19,6 +19,49 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   <interface name="org.freedesktop.Telepathy.Channel.Interface.ChatState">
     <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.Text"/>
 
+    <tp:mapping name="Chat_State_Map">
+      <tp:added version="0.19.7"/>
+      <tp:docstring>A map from contacts to their chat states.</tp:docstring>
+      <tp:member name="Contact" type="u" tp:type="Contact_Handle">
+        <tp:docstring>A contact</tp:docstring>
+      </tp:member>
+      <tp:member name="State" type="u" tp:type="Channel_Chat_State">
+        <tp:docstring>The contact's chat state</tp:docstring>
+      </tp:member>
+    </tp:mapping>
+
+    <property name="ChatStates" tp:name-for-bindings="Chat_States"
+      access="read" type="a{uu}" tp:type="Chat_State_Map">
+      <tp:added version="0.19.7"/>
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>A map containing the chat states of all contacts in this
+          channel whose chat state is not Inactive.</p>
+
+        <p>Contacts in this channel, but who are not listed in this map,
+          may be assumed to be in the Inactive state.</p>
+
+        <p>In implementations that do not have this property, its value may be
+          assumed to be empty until a
+          <tp:member-ref>ChatStateChanged</tp:member-ref> signal indicates
+          otherwise.</p>
+
+        <tp:rationale>
+          <p>This property was not present in older versions of telepathy-spec,
+            because chat states in XMPP are not state-recoverable (if you
+            miss the change notification signal, there's no way to know the
+            state). However, this property still allows clients to recover
+            state changes that were seen by the CM before the client started
+            to deal with the channel.</p>
+
+          <p>In CMs that follow older spec versions, assuming Inactive will
+            mean that initial chat states will always be assumed to be
+            Inactive, which is the best we can do. XEP 0085 specifies
+            Inactive as the "neutral" state to be assumed unless told
+            otherwise.</p>
+        </tp:rationale>
+      </tp:docstring>
+    </property>
+
     <method name="SetChatState" tp:name-for-bindings="Set_Chat_State">
       <arg direction="in" name="State" type="u" tp:type="Channel_Chat_State">
         <tp:docstring>
diff --git a/spec/Channel_Interface_Service_Point.xml b/spec/Channel_Interface_Service_Point.xml
index 5a0d540e5..787397b20 100644
--- a/spec/Channel_Interface_Service_Point.xml
+++ b/spec/Channel_Interface_Service_Point.xml
@@ -17,8 +17,8 @@ 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.ServicePoint.DRAFT" tp:causes-havoc="experimental">
-    <tp:added version="0.19.6">(draft version, not API-stable)</tp:added>
+  <interface name="org.freedesktop.Telepathy.Channel.Interface.ServicePoint">
+    <tp:added version="0.19.7">(as stable API)</tp:added>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>An interface for channels
@@ -55,8 +55,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       type="(us)" tp:type="Service_Point" access="read">
       <tp:docstring>
         The service point that the channel is connected to. If the channel is
-        not connected to any service points, the CM MUST set the
-        <tp:type>Service_Point_Type</tp:type> field to None.
+        not connected to a service point, the CM MUST set the
+        <tp:type>Service_Point_Type</tp:type> field to None; for instance,
+        this will be the case for ordinary calls.
       </tp:docstring>
     </property>
 
@@ -73,7 +74,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         be in the process of connecting to the new service point.</p>
       </tp:docstring>
 
-      <arg name="ServicePoint" type="(us)" tp:type="Service_Point">
+      <arg name="Service_Point" type="(us)" tp:type="Service_Point">
         <tp:docstring>
           The new service point that is being used.
         </tp:docstring>
diff --git a/spec/Connection_Interface_Anonymity.xml b/spec/Connection_Interface_Anonymity.xml
index 5426b5d50..4d7391891 100644
--- a/spec/Connection_Interface_Anonymity.xml
+++ b/spec/Connection_Interface_Anonymity.xml
@@ -21,9 +21,8 @@
       02110-1301, USA.</p>
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Connection.Interface.Anonymity.DRAFT"
-    tp:causes-havoc="experimental">
-    <tp:added version="0.19.6">(draft version, not API-stable)</tp:added>
+  <interface name="org.freedesktop.Telepathy.Connection.Interface.Anonymity">
+    <tp:added version="0.19.7">(as stable API)</tp:added>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>An interface to support anonymity settings on a per-connection basis.
@@ -57,7 +56,7 @@
           service level would choose both (anonymity services are opaque
           to clients of this interface).</p>
 
-          <p>Clients SHOULD NOT set both Client_Info and ShowClient_Info modes.
+          <p>Clients SHOULD NOT set both Client_Info and Show_Client_Info modes.
           If they are set, the CM MUST respect Client_Info and ignore
           Show_Client_Info.</p>
         </tp:docstring>
@@ -68,14 +67,15 @@
           <p>Explicitly request showing of client information. In connection
           context, this can be used to override service default. In channel
           context, this overrides connection anonymity modes.</p>
+
           <tp:rationale>
-            In GSM, it's possible to have CLIR enabled by default, and
-            explicitly suppress CLIR for a single phone call.
+            <p>In GSM, it's possible to have CLIR enabled by default, and
+              explicitly suppress CLIR for a single phone call.</p>
           </tp:rationale>
 
           <p>Clients SHOULD NOT set both Client_Info and Show_Client_Info modes.
           If they are set, the CM MUST respect Client_Info and ignore
-          ShowClientInfo. The CM MAY set both Client_Info and Show_Client_Info
+          Show_Client_Info. The CM MAY set both Client_Info and Show_Client_Info
           in <tp:member-ref>SupportedAnonymityModes</tp:member-ref> to indicate
           its support for explicitly hiding and publicising client information.
           </p>
@@ -110,21 +110,30 @@
       </tp:docstring>
     </property>
 
-    <property name="Mandatory" type="b" access="readwrite"
-      tp:name-for-bindings="Mandatory">
+    <property name="AnonymityMandatory" type="b" access="readwrite"
+      tp:name-for-bindings="Anonymity_Mandatory">
       <tp:docstring>
         <p>This specifies whether or not the anonymity settings MUST be respected
           by the CM and any intermediaries between the local and remote contacts.
           If this is set to true but anonymity settings cannot be followed, then
           the session MUST be denied with a
-          <code>org.freedesktop.Telepathy.Errors.NotAvailable</code> error.
+          <code>org.freedesktop.Telepathy.Errors.WouldBreakAnonymity</code>
+          error.
           Any client that sets <tp:member-ref>AnonymityModes</tp:member-ref>
           SHOULD also set this property first (rather than accepting the CM's
           default value).</p>
 
-          <p>This property can also be set using a connection parameter in <tp:dbus-ref
+        <p>This property SHOULD also be made available as a parameter to
+          <tp:dbus-ref
             namespace="org.freedesktop.Telepathy.ConnectionManager">RequestConnection</tp:dbus-ref>,
-            see <tp:type>Conn_Mgr_Param_Flags</tp:type> for more information.</p>
+          with the DBus_Property flag in its
+          <tp:type>Conn_Mgr_Param_Flags</tp:type>. For connections managed
+          by the <tp:dbus-ref
+            namespace="org.freedesktop.Telepathy">AccountManager</tp:dbus-ref>,
+          clients (other than the account manager itself) SHOULD set this
+          property via the Account's <tp:dbus-ref
+            namespace="org.freedesktop.Telepathy.Account">UpdateParameters</tp:dbus-ref>
+          method.</p>
       </tp:docstring>
     </property>
 
@@ -134,12 +143,20 @@
         <p>The currently enabled anonymity modes for the connection. Setting
           has the effect of requesting new modes for the connection, and may
           raise an error if the unsupported modes are set. Successfully changing
-          the modes will result in emmision of
+          the modes will result in emission of
           <tp:member-ref>AnonymityModesChanged</tp:member-ref> signal.</p>
 
-        <p>This property can also be set using a connection parameter in <tp:dbus-ref
-          namespace="org.freedesktop.Telepathy.ConnectionManager">RequestConnection</tp:dbus-ref>,
-          see <tp:type>Conn_Mgr_Param_Flags</tp:type> for more information.</p>
+        <p>This property SHOULD also be made available as a parameter to
+          <tp:dbus-ref
+            namespace="org.freedesktop.Telepathy.ConnectionManager">RequestConnection</tp:dbus-ref>,
+          with the DBus_Property flag in its
+          <tp:type>Conn_Mgr_Param_Flags</tp:type>. For connections managed
+          by the <tp:dbus-ref
+            namespace="org.freedesktop.Telepathy">AccountManager</tp:dbus-ref>,
+          clients (other than the account manager itself) SHOULD set this
+          property via the Account's <tp:dbus-ref
+            namespace="org.freedesktop.Telepathy.Account">UpdateParameters</tp:dbus-ref>
+          method.</p>
       </tp:docstring>
       <tp:possible-errors>
         <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument">
diff --git a/spec/Connection_Interface_Cellular.xml b/spec/Connection_Interface_Cellular.xml
index c2a25503a..cd5141f8e 100644
--- a/spec/Connection_Interface_Cellular.xml
+++ b/spec/Connection_Interface_Cellular.xml
@@ -26,7 +26,7 @@
     <tp:added version="0.19.6">(draft version, not API-stable)</tp:added>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-      <p>This interface is for various cellular things (GSM and/or CDMA) things that
+      <p>This interface is for various cellular things (GSM and/or CDMA) that
         aren't really applicable to other protocols.</p>
     </tp:docstring>
 
@@ -34,20 +34,48 @@
       type="u" access="readwrite">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Define how long should the service centre try message delivery before
-        giving up, failing delivery and deleting the message. A value of 0 means
-        to use the service centre's default period.</p>
+          giving up, failing delivery and deleting the message. A value of 0
+          means to use the service centre's default period.</p>
+
         <p>The value specified is in seconds. Note that various protocols or
-        implementations may round the value up (eg. to a minute or hour
-        precision). The maximum validity period may vary depending on
-        protocol or provider.</p>
+          implementations may round the value up (eg. to a minute or hour
+          precision). The maximum validity period may vary depending on
+          protocol or provider.</p>
+
+        <p>Connections with this interface SHOULD provide this property as a
+          parameter for <tp:dbus-ref namespace="org.freedesktop.Telepathy"
+            >ConnectionManager.RequestConnection</tp:dbus-ref>, with the
+          <code>DBus_Property</code> flag.</p>
+
+        <p>For connections managed by the <tp:dbus-ref
+            namespace="org.freedesktop.Telepathy">AccountManager</tp:dbus-ref>,
+          this property SHOULD be set via the Account Manager, by calling
+          <tp:dbus-ref namespace="org.freedesktop.Telepathy"
+            >Account.UpdateParameters</tp:dbus-ref>; the AccountManager
+          provides change-notification, as long as all other clients cooperate
+          by using it instead of setting this property directly.</p>
       </tp:docstring>
     </property>
 
     <property name="MessageServiceCentre" tp:name-for-bindings="Message_Service_Centre"
       type="s" access="readwrite">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        Address for the messaging service centre. Typically (as is the case
-        for GSM's SMSC), it's the ISDN / telephony address (ie. a phone number).
+        <p>Address for the messaging service centre. Typically (as is the case
+          for GSM's SMSC), it's the ISDN / telephony address (ie. a phone
+          number).</p>
+
+        <p>Connections with this interface SHOULD provide this property as a
+          parameter for <tp:dbus-ref namespace="org.freedesktop.Telepathy"
+            >ConnectionManager.RequestConnection</tp:dbus-ref>, with the
+          <code>DBus_Property</code> flag.</p>
+
+        <p>For connections managed by the <tp:dbus-ref
+            namespace="org.freedesktop.Telepathy">AccountManager</tp:dbus-ref>,
+          this property SHOULD be set via the Account Manager, by calling
+          <tp:dbus-ref namespace="org.freedesktop.Telepathy"
+            >Account.UpdateParameters</tp:dbus-ref>; the AccountManager
+          provides change-notification, as long as all other clients cooperate
+          by using it instead of setting this property directly.</p>
       </tp:docstring>
     </property>
 
diff --git a/spec/Connection_Interface_Forwarding.xml b/spec/Connection_Interface_Forwarding.xml
index 4c1c11937..7035ca999 100644
--- a/spec/Connection_Interface_Forwarding.xml
+++ b/spec/Connection_Interface_Forwarding.xml
@@ -105,11 +105,12 @@
       </tp:enumvalue>
 
       <tp:enumvalue value="1" suffix="Busy">
-        <tp:docstring>
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           <p>The incoming channel should be forwarded if a busy signal is
             detected.  What defines "Busy" is CM-specific (perhaps a single
             resource is already in use, or a user's status is set to Busy
             <tp:type>Connection_Presence_Type</tp:type>).</p>
+
           <p>If initial timeout is specified for Busy condition and call
             waiting is not supported by the service, the timeout will be
             ignored.</p>
@@ -147,13 +148,14 @@
       </tp:docstring>
 
       <tp:member type="u" name="Timeout">
-        <tp:docstring>
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           <p>The length of time (in seconds) to wait the contact to respond
             to the forwarded channel.  This MAY be ignored by the CM if it
             isn't supported by the underlying network/protocol for the
             specific status of the remote contact (for example, a GSM call
             that is forwarded may return Not_Reachable immediately without
             waiting for the timeout value to expire).</p>
+
           <p>A value of 0 means the condition can match immediately. A
             value of MAX_UINT32 means that the CM's default should be
             used.</p>
@@ -208,23 +210,22 @@
     <property name="SupportedForwardingConditions" type="a{uu}" access="read"
       tp:type="Supported_Forwarding_Conditions_Map"
       tp:name-for-bindings="Supported_Forwarding_Conditions">
-      <tp:docstring>
-        <p>
-          A map of forwarding conditions supported on this connection to
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>A map of forwarding conditions supported on this connection to
           maximum number of <tp:type>Forwarding_Rule_Entry</tp:type>
-          supported for the specific condition.
-          <tp:rationale>
-            When forwarding is done by the provider, different providers
+          supported for the specific condition.</p>
+
+        <tp:rationale>
+          <p>When forwarding is done by the provider, different providers
             might support different chain sizes, or provider and local
-            implementation chain sizes might differ.
-          </tp:rationale>
-        </p>
+            implementation chain sizes might differ.</p>
+        </tp:rationale>
       </tp:docstring>
     </property>
 
     <property name="ForwardingRules" type="a{u(ua(uu))}" access="read"
       tp:type="Forwarding_Rule_Map" tp:name-for-bindings="Forwarding_Rules">
-      <tp:docstring>
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The current forwarding rules that are enabled for this connection.
           Forwarding rules each contain an array of type
           <tp:type>Forwarding_Rule_Entry</tp:type>.</p>
@@ -269,7 +270,7 @@
       </tp:docstring>
 
       <arg direction="in" name="Condition" type="u" tp:type="Forwarding_Condition">
-        <tp:docstring>
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           <p>The forwarding rule to override.  Note that this SHOULD not affect
             other rules; setting a rule that overrides others (such as
             Forwarding_Rule_Unconditional) will not modify other rules.  This
diff --git a/spec/Connection_Interface_Service_Point.xml b/spec/Connection_Interface_Service_Point.xml
index b0b34b678..b135c04c7 100644
--- a/spec/Connection_Interface_Service_Point.xml
+++ b/spec/Connection_Interface_Service_Point.xml
@@ -17,8 +17,8 @@ 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.Connection.Interface.ServicePoint.DRAFT" tp:causes-havoc="experimental">
-    <tp:added version="0.19.6">(draft version, not API-stable)</tp:added>
+  <interface name="org.freedesktop.Telepathy.Connection.Interface.ServicePoint">
+    <tp:added version="0.19.7">(as stable API)</tp:added>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>An interface for connections whose channels may be able to indicate
@@ -33,33 +33,33 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </tp:docstring>
 
    <tp:struct name="Service_Point_Info" array-name="Service_Point_Info_List">
-      <tp:member type="(us)" tp:type="Service_Point" name="ServicePoint">
+      <tp:member type="(us)" tp:type="Service_Point" name="Service_Point">
         <tp:docstring>
           The service point.
         </tp:docstring>
       </tp:member>
-      <tp:member type="as" name="ServiceIDs">
+      <tp:member type="as" name="Service_IDs">
         <tp:docstring>
           A list of IDs that are mapped to this service. This is provided as
           a convenience for the UIs, but the preferred method for
-          requesting channel to a service is by setting <tp:dbus-ref
-            namespace="org.freedesktop.Telepathy.Channel.Interface.ServicePoint.DRAFT">InitialServicePoint</tp:dbus-ref>
-            property in channel request.
+          requesting channel to a service is by setting the <tp:dbus-ref
+            namespace="org.freedesktop.Telepathy.Channel.Interface.ServicePoint">InitialServicePoint</tp:dbus-ref>
+            property in a channel request.
         </tp:docstring>
       </tp:member>
       <tp:docstring>
-        <p>Description of a service point and IDs which are mapped to id.</p>
+        <p>Description of a service point and IDs which are mapped to it.</p>
 
-        <p>An example Service Point info for GSM emergency calls (callable through
-        "911" and "112") could look like:</p>
+        <p>An example Service Point info for GSM emergency calls (callable
+          through "911" and "112") could look like:</p>
 
 <pre>
   ServicePointInfo = (
-    ServicePoint: (
-      ServicePointType: 1 (Emergency),
-      ServicePoint: "urn:service:sos"
+    Service_Point: (
+      Service_Point_Type: 1 (Emergency),
+      Service_Point: "urn:service:sos"
     ),
-    ServiceIDs: [ "911", "112" ]
+    Service_IDs: [ "911", "112" ]
   )
 </pre>
       </tp:docstring>
@@ -73,20 +73,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </property>
 
     <signal name="ServicePointsChanged" tp:name-for-bindings="Service_Points_Changed">
-      <arg name="ServicePoints" type="a((us)as)" tp:type="Service_Point_Info[]">
+      <arg name="Service_Points" type="a((us)as)" tp:type="Service_Point_Info[]">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-         <p>The new list of service points.</p>
+          <p>The new value of
+            <tp:member-ref>KnownServicePoints</tp:member-ref>.</p>
         </tp:docstring>
       </arg>
       <tp:docstring>
-        Indicate that the list of known service points (or their IDs) have
-        changed, presenting the new list.
+        Emitted when the list of known service points (or their IDs) has
+        changed.
       </tp:docstring>
     </signal>
 
     <tp:struct name="Service_Point">
       <tp:docstring>A service point.</tp:docstring>
-      <tp:member type="u" name="ServicePointType" tp:type="Service_Point_Type">
+      <tp:member type="u" name="Service_Point_Type"
+        tp:type="Service_Point_Type">
         <tp:docstring>
           The service type.
         </tp:docstring>
@@ -94,7 +96,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       <tp:member type="s" name="Service">
         <tp:docstring>
           String representation of the service point. The representation is
-          service specific; it may be <tp:type>Uniform_Resource_Name</tp:type>
+          service specific; it may be a 'service' Uniform Resource Name as
+          specified by <a
+            href="http://www.rfc-editor.org/rfc/rfc5031.txt">RFC 5031</a>,
           or may be in some other form. Empty, unused or unknown value is
           represented by "".
         </tp:docstring>
@@ -103,12 +107,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
 
     <tp:enum name="Service_Point_Type" type="u">
       <tp:docstring>
-        The various types of service points the channel might connect to.
+        The various types of service points a channel might connect to.
       </tp:docstring>
 
       <tp:enumvalue value="0" suffix="None">
         <tp:docstring>
-          The service point is not used/available.
+          The channel is not communicating with a service point, or it is not
+          known whether it is communicating with a service point (e.g. an
+          ordinary call).
         </tp:docstring>
       </tp:enumvalue>
 
@@ -125,11 +131,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         </tp:docstring>
       </tp:enumvalue>
     </tp:enum>
-
-    <tp:simple-type name="Uniform_Resource_Name" type="s">
-      <tp:docstring>Uniform Resource Name as specified by
-        <a href="http://www.rfc-editor.org/rfc/rfc5031.txt">RFC 5031</a>.</tp:docstring>
-    </tp:simple-type>
   </interface>
 </node>
 <!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/spec/all.xml b/spec/all.xml
index 591efb52b..700c132ce 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.19.6</tp:version>
+<tp:version>0.19.7</tp:version>
 
 <tp:copyright>Copyright © 2005-2010 Collabora Limited</tp:copyright>
 <tp:copyright>Copyright © 2005-2010 Nokia Corporation</tp:copyright>
diff --git a/spec/errors.xml b/spec/errors.xml
index 0137e776c..60a93c95c 100644
--- a/spec/errors.xml
+++ b/spec/errors.xml
@@ -420,7 +420,20 @@
     </tp:docstring>
   </tp:error>
 
-  <tp:copyright>Copyright © 2005-2009 Collabora Limited</tp:copyright>
+  <tp:error name="Would Break Anonymity">
+    <tp:added version="0.19.7"/>
+    <tp:docstring>
+      Raised if a request cannot be satisfied without violating an earlier
+      request for anonymity, and the earlier request specified that raising
+      an error is preferable to disclosing the user's identity (for instance
+      via <tp:dbus-ref namespace="org.freedesktop.Telepathy"
+        >Connection.Interface.Anonymity.AnonymityMandatory</tp:dbus-ref> or
+      <tp:dbus-ref namespace="org.freedesktop.Telepathy"
+        >Channel.Interface.Anonymity.AnonymityMandatory</tp:dbus-ref>).
+    </tp:docstring>
+  </tp:error>
+
+  <tp:copyright>Copyright © 2005-2010 Collabora Limited</tp:copyright>
   <tp:copyright>Copyright © 2005-2009 Nokia Corporation</tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
 <p>This library is free software; you can redistribute it and/or