From 078dd0165ffe045229b0efee92ec8f425cfd28df Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 25 Sep 2015 11:58:47 +0100
Subject: [PATCH 1/4] Update the room creation API spec to include new keys:
 'preset' and 'initial_state'

---
 specification/1-client_server_api.rst | 33 ++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/specification/1-client_server_api.rst b/specification/1-client_server_api.rst
index 93e3cb90..e3dbde5a 100644
--- a/specification/1-client_server_api.rst
+++ b/specification/1-client_server_api.rst
@@ -750,10 +750,41 @@ options which can be set when creating a room:
     This will tell the server to invite everyone in the list to the newly
     created room.
 
+``preset``
+  Type:
+    String
+  Optional:
+    Yes
+  Value:
+    ``private_chat`` or ``public_chat``
+  Description:
+    Convenience parameter for setting various default state events based on a
+    preset.
+
+    Two presets are defined:
+
+    - ``private_chat``: Sets the ``join_rules`` to ``invite`` and
+      ``history_visibility`` to ``shared``
+    - ``public_chat``: Sets the ``join_rules`` to ``public`` and
+      ``history_visibility`` to ``shared``
+
+``initial_state``
+  Type:
+    List
+  Optional:
+    Yes
+  Value:
+    A list of state events to set in the new room.
+  Description:
+    Allows the user to override the default state events set in the new room.
+
+    The expected format of the state events are an object with ``type``,
+    ``state_key`` and ``content`` keys set.
+
 Example::
 
   {
-    "visibility": "public",
+    "preset": "public_chat",
     "room_alias_name": "thepub",
     "name": "The Grand Duke Pub",
     "topic": "All about happy hour"

From 18dc7784df09c3ad6c3f4d844b87d046538bd5a5 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 25 Sep 2015 14:34:06 +0100
Subject: [PATCH 2/4] Mention precedence

---
 specification/1-client_server_api.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/specification/1-client_server_api.rst b/specification/1-client_server_api.rst
index e3dbde5a..c5453931 100644
--- a/specification/1-client_server_api.rst
+++ b/specification/1-client_server_api.rst
@@ -781,6 +781,9 @@ options which can be set when creating a room:
     The expected format of the state events are an object with ``type``,
     ``state_key`` and ``content`` keys set.
 
+    Takes precedence over events set by ``presets``, but gets overriden by
+    ``name`` and ``topic`` keys.
+
 Example::
 
   {

From 73b4090f52f324c598db699899b22eed72503a3d Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 30 Sep 2015 10:22:12 +0100
Subject: [PATCH 3/4] Add private_chat_shared_power

---
 specification/1-client_server_api.rst | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/specification/1-client_server_api.rst b/specification/1-client_server_api.rst
index c5453931..329a87dd 100644
--- a/specification/1-client_server_api.rst
+++ b/specification/1-client_server_api.rst
@@ -756,15 +756,18 @@ options which can be set when creating a room:
   Optional:
     Yes
   Value:
-    ``private_chat`` or ``public_chat``
+    ``private_chat``, ``private_chat_shared_power`` or ``public_chat``
   Description:
     Convenience parameter for setting various default state events based on a
     preset.
 
-    Two presets are defined:
+    Three presets are defined:
 
     - ``private_chat``: Sets the ``join_rules`` to ``invite`` and
       ``history_visibility`` to ``shared``
+    - ``private_chat_shared_power``: Set the ``join_rules`` to
+      ``invite``, ``history_visibility`` to ``shared`` and gives all invitees
+      the same power level as the creator.
     - ``public_chat``: Sets the ``join_rules`` to ``public`` and
       ``history_visibility`` to ``shared``
 

From dbc72c43aca270d86c128caba1cde434642bcb8a Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 2 Oct 2015 10:28:29 +0100
Subject: [PATCH 4/4] s/private_chat_shared_power/trusted_private_chat/

---
 specification/1-client_server_api.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/specification/1-client_server_api.rst b/specification/1-client_server_api.rst
index 329a87dd..1c64f021 100644
--- a/specification/1-client_server_api.rst
+++ b/specification/1-client_server_api.rst
@@ -756,7 +756,7 @@ options which can be set when creating a room:
   Optional:
     Yes
   Value:
-    ``private_chat``, ``private_chat_shared_power`` or ``public_chat``
+    ``private_chat``, ``trusted_private_chat`` or ``public_chat``
   Description:
     Convenience parameter for setting various default state events based on a
     preset.
@@ -765,9 +765,9 @@ options which can be set when creating a room:
 
     - ``private_chat``: Sets the ``join_rules`` to ``invite`` and
       ``history_visibility`` to ``shared``
-    - ``private_chat_shared_power``: Set the ``join_rules`` to
-      ``invite``, ``history_visibility`` to ``shared`` and gives all invitees
-      the same power level as the creator.
+    - ``trusted_private_chat``: Set the ``join_rules`` to ``invite``,
+      ``history_visibility`` to ``shared`` and gives all invitees the same
+      power level as the creator.
     - ``public_chat``: Sets the ``join_rules`` to ``public`` and
       ``history_visibility`` to ``shared``