Update to spec 0.21.10

Add TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_MAY_SAVE_RESPONSE

1 files changed, 19 insertions, 39 deletions

diff --git a/spec/Account.xml b/spec/Account.xml
index acd8c3028..b706e279f 100644
--- a/spec/Account.xml
+++ b/spec/Account.xml
@@ -162,11 +162,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         user at account creation time. The account creation user interface
         is responsible for setting a reasonable default value in the user's
         locale; something like "Jabber (bob@example.com)" would be sensible.
-
-        <tp:rationale>
-          This approximately corresponds to "display name" in NMC 4.x and
-          Decibel.
-        </tp:rationale>
       </tp:docstring>
     </property>
 
@@ -177,13 +172,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         or the empty string to not specify an icon. If the icon is set to
         an empty string, the account manager or any client MAY derive a
         default icon, for instance from the protocol.
-
-        <tp:rationale>
-          This approximately corresponds to mc_profile_get_icon_name
-          (or possibly mc_profile_get_branding_icon_name) in NMC 4.x.
-          It's accessed via the account rather than the profile because
-          we no longer have profiles as a core concept.
-        </tp:rationale>
       </tp:docstring>
     </property>
 
@@ -256,7 +244,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           name for them in our contact list (a "handle" or "pet name" as
           described in XEP-0165 and its references). The terminology change
           from alias to nickname here is a step in that direction.
-          This corresponds to NMC 4.x mc_account_get_alias.
         </tp:rationale>
       </tp:docstring>
     </property>
@@ -318,7 +305,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           only those parameters that are stored for this account, and SHOULD
           only include those parameters that the user has explicitly set.
         </p>
-        <p>This property cannot be altered using Set() - use
+        <p>This property cannot be altered using
+          <code>org.freedesktop.DBus.Properties.Set()</code>; use
           <tp:member-ref>UpdateParameters</tp:member-ref> instead.</p>
       </tp:docstring>
     </property>
@@ -328,14 +316,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         <p>Change the value of the <tp:member-ref>Parameters</tp:member-ref>
           property.</p>
 
-        <p>If any of the changed parameters'
+        <p>If any of the <var>Set</var> parameters’
           <tp:type>Conn_Mgr_Param_Flags</tp:type> include
           <code>DBus_Property</code>, the change will be applied immediately to
-          the
-          corresponding D-Bus Property on the active
-          <tp:member-ref>Connection</tp:member-ref>, if there is one. Changes to
-          other parameters will not take effect until the next time the account
-          is disconnected and reconnected.</p>
+          the corresponding D-Bus Property on the active
+          <tp:member-ref>Connection</tp:member-ref>, if there is one. If any of
+          the <var>Unset</var> parameters’
+          <tp:type>Conn_Mgr_Param_Flags</tp:type> include both
+          <code>DBus_Property</code> and <code>Has_Default</code>, the
+          corresponding D-Bus Property on the connection will be set to the
+          default value.  Changes to other parameters will not take effect
+          until the next time the account is disconnected and reconnected. (If
+          parameters are explicitly set to their default value, or are unset
+          when previously set to their default value, the account manager MAY
+          decide that no reconnection is necessary to make the change take
+          effect.)</p>
 
         <tp:rationale>
           <p>In general, reconnecting is a destructive operation that shouldn't
@@ -374,7 +369,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
       <arg name="Reconnect_Required" type="as" direction="out">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          <p>If all of the parameters had the <code>DBus_Property</code> flag,
+          <p>If all of the updates could be applied to the active
+            <tp:member-ref>Connection</tp:member-ref> (if any),
             the empty list, signifying that no reconnection is required for the
             new parameters to take effect. For example, if the only parameter
             updated is <tt>...Cellular.<tp:dbus-ref
@@ -441,11 +437,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         requested by the user (for
         instance, if the user tries to start a conversation using this
         account).
-
-        <tp:rationale>
-          This approximately corresponds to NMC 4.x "enabled" and Decibel
-          "autoreconnect".
-        </tp:rationale>
       </tp:docstring>
     </property>
 
@@ -482,8 +473,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         <tp:rationale>
           If the AM is doing some sort of backoff/delay on reconnection
           attempts, the account's status is conceptually "Connecting" even
-          though there is no Connection. This vaguely corresponds to
-          GetCurrentStatus in NMC 4.x.
+          though there is no Connection.
         </tp:rationale>
       </tp:docstring>
     </property>
@@ -499,8 +489,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
         <tp:rationale>
           If you weren't watching the Connection at the time it failed,
-          you can't tell why - unless the AM can tell you. This is part
-          of GetCurrentStatus in NMC 4.x.
+          you can't tell why - unless the AM can tell you.
         </tp:rationale>
       </tp:docstring>
     </property>
@@ -568,10 +557,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         interface, the type SHOULD be Connection_Presence_Type_Unset.
         The account manager is expected to set this by observing signals
         from the Connection.
-
-        <tp:rationale>
-          This corresponds to GetPresenceActual in NMC 4.x.
-        </tp:rationale>
       </tp:docstring>
     </property>
 
@@ -589,11 +574,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           it must signal this by setting the RequestedPresence to the same
           thing as the <tp:member-ref>AutomaticPresence</tp:member-ref>.</p>
 
-        <tp:rationale>
-          This corresponds to e.g. GetPresence and GetPresenceMessage
-          in NMC 4.x.
-        </tp:rationale>
-
         <p>The <tp:type>Connection_Presence_Type</tp:type> in this property
           MUST NOT be Unset, Unknown or Error.</p>