Merge branch 'master' into next

4 files changed, 13 insertions, 6 deletions

diff --git a/spec/Channel_Interface_Room_Config1.xml b/spec/Channel_Interface_Room_Config1.xml
index 9fba3a44..a2b25079 100644
--- a/spec/Channel_Interface_Room_Config1.xml
+++ b/spec/Channel_Interface_Room_Config1.xml
@@ -30,7 +30,7 @@
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>Represents the configuration of a chatroom, some aspects of which may
-        be modifiable by the user, depending on their priviledges. This
+        be modifiable by the user, depending on their privileges. This
         corresponds to the room configuration on XMPP, and various channel mode
         flags on IRC.</p>
 
diff --git a/spec/Channel_Interface_Tube1.xml b/spec/Channel_Interface_Tube1.xml
index e02ce2cb..6a16880e 100644
--- a/spec/Channel_Interface_Tube1.xml
+++ b/spec/Channel_Interface_Tube1.xml
@@ -39,7 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     </tp:docstring>
 
     <property name="Parameters" type="a{sv}" tp:type="String_Variant_Map"
-              access="read" tp:name-for-bindings="Parameters">
+              access="read" tp:name-for-bindings="Parameters"
+              tp:immutable="sometimes">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Each tube has a dictionary of arbitrary parameters. Parameters are
           commonly used to bootstrap legacy protocols where you can't
diff --git a/spec/Channel_Type_DBus_Tube1.xml b/spec/Channel_Type_DBus_Tube1.xml
index 21e4ac42..a2cb8a7f 100644
--- a/spec/Channel_Type_DBus_Tube1.xml
+++ b/spec/Channel_Type_DBus_Tube1.xml
@@ -127,7 +127,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     </signal>
 
     <property name="ServiceName" type="s" access="read"
-              tp:name-for-bindings="Service_Name">
+              tp:name-for-bindings="Service_Name"
+              tp:requestable="yep"
+              tp:immutable="yep">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>A string representing the service name that will be used over the
           tube. It SHOULD be a well-known D-Bus service name, of the form
@@ -170,7 +172,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     <property name="SupportedAccessControls" type="au"
               tp:type="Socket_Access_Control[]" access="read"
-              tp:name-for-bindings="Supported_Access_Controls">
+              tp:name-for-bindings="Supported_Access_Controls"
+              tp:immutable="yep">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>A list of the access control types that are supported with this channel.
         Note that only Socket_Access_Control_Localhost and
diff --git a/spec/Channel_Type_Stream_Tube1.xml b/spec/Channel_Type_Stream_Tube1.xml
index 51244a1e..51337978 100644
--- a/spec/Channel_Type_Stream_Tube1.xml
+++ b/spec/Channel_Type_Stream_Tube1.xml
@@ -232,7 +232,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     </signal>
 
     <property name="Service" type="s" access="read"
-              tp:name-for-bindings="Service">
+              tp:name-for-bindings="Service"
+              tp:immutable="yes"
+              tp:requestable="yes">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p> A string representing the service name that will be used over the
           tube.  It should be a well-known TCP service name as defined by
@@ -259,7 +261,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     <property name="SupportedSocketTypes" type="a{uau}"
               tp:type="Supported_Socket_Map" access="read"
-              tp:name-for-bindings="Supported_Socket_Types">
+              tp:name-for-bindings="Supported_Socket_Types"
+              tp:immutable="yes">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>A mapping from address types (members of Socket_Address_Type) to
         arrays of access-control type (members of Socket_Access_Control)