From c3769ef75ca039ad2bfe2532a17ad979c631c71c Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Mon, 16 Nov 2015 16:49:32 +0000
Subject: [PATCH] Add a module for client config to the specification

---
 specification/modules/client_config.rst | 26 +++++++++++++++++++++++++
 specification/targets.yaml              |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 specification/modules/client_config.rst

diff --git a/specification/modules/client_config.rst b/specification/modules/client_config.rst
new file mode 100644
index 00000000..837f174d
--- /dev/null
+++ b/specification/modules/client_config.rst
@@ -0,0 +1,26 @@
+Client Config
+=============
+
+.. _module:client_config:
+
+Clients can store their config on their homeserver. This config will be synced
+between different devices and can persist across installations on a particular
+device.
+
+The config may be either global or scoped to a particular rooms.
+
+Events
+------
+
+The client recieves the config as a event in the ``private_user_data`` sections
+of a v2 /sync.
+
+These events can also be received in a v1 /events response or in the
+``private_user_data`` section of a room in v1 /initialSync. ``m.tag``
+events appearing in v1 /events will have a ``room_id`` with the room
+the tags are for.
+
+Client Behaviour
+----------------
+
+{{v2_client_config_http_api}}
diff --git a/specification/targets.yaml b/specification/targets.yaml
index 2c6a8f20..b6ac6a65 100644
--- a/specification/targets.yaml
+++ b/specification/targets.yaml
@@ -26,6 +26,7 @@ groups:  # reusable blobs of files when prefixed with 'group:'
     - modules/third_party_invites.rst
     - modules/search.rst
     - modules/tags.rst
+    - modules/client_config.rst
 
 
 title_styles: ["=", "-", "~", "+", "^", "`"]