From f6d9e53f5ce1f6e8382939f5ff538a6342aed7db Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 31 Aug 2018 11:13:32 -0600
Subject: [PATCH] Clarify that homeserver must reject clients from setting
 m.fully_read

---
 api/client-server/account-data.yaml    | 22 ----------------------
 specification/modules/account_data.rst |  7 +++++++
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/api/client-server/account-data.yaml b/api/client-server/account-data.yaml
index c468f1c0..76b2b156 100644
--- a/api/client-server/account-data.yaml
+++ b/api/client-server/account-data.yaml
@@ -67,17 +67,6 @@ paths:
         200:
           description:
             The account_data was successfully added.
-        405:
-          description:
-            The account data event type cannot be set here. This generally indicates
-            that another API is available for managing the data contained in the event.
-          schema:
-            $ref: "definitions/errors/error.yaml"
-          examples: 
-            application/json: {
-              "errcode": "M_UNKNOWN",
-              "error": "Cannot set m.fully_read through this API. Use /rooms/{roomId}/read_markers"
-            }
       tags:
         - User data
   "/user/{userId}/rooms/{roomId}/account_data/{type}":
@@ -127,16 +116,5 @@ paths:
         200:
           description:
             The account_data was successfully added.
-        405:
-          description:
-            The account data event type cannot be set here. This generally indicates
-            that another API is available for managing the data contained in the event.
-          schema:
-            $ref: "definitions/errors/error.yaml"
-          examples: 
-            application/json: {
-              "errcode": "M_UNKNOWN",
-              "error": "Cannot set m.fully_read through this API. Use /rooms/{roomId}/read_markers"
-            }
       tags:
         - User data
diff --git a/specification/modules/account_data.rst b/specification/modules/account_data.rst
index d0ed201a..f0bf285f 100644
--- a/specification/modules/account_data.rst
+++ b/specification/modules/account_data.rst
@@ -39,3 +39,10 @@ Client Behaviour
 ----------------
 
 {{account_data_cs_http_api}}
+
+
+Server Behaviour
+----------------
+
+Servers MUST reject clients from setting account data for event types that
+the server manages. Currently, this only includes `m.fully_read`_.