From 40f7eab73f1a3055c3c4874b8d122f6b9c57e167 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Wed, 18 Nov 2015 15:44:18 +0000
Subject: [PATCH] s/private_user_data/account_data/

---
 api/client-server/v1/sync.yaml                | 2 +-
 api/client-server/v2_alpha/client-config.yaml | 4 ++--
 api/client-server/v2_alpha/sync.yaml          | 2 +-
 specification/modules/client_config.rst       | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/client-server/v1/sync.yaml b/api/client-server/v1/sync.yaml
index b8608171..58cd5544 100644
--- a/api/client-server/v1/sync.yaml
+++ b/api/client-server/v1/sync.yaml
@@ -131,7 +131,7 @@ paths:
                           "type": "m.presence"
                       }
                   ],
-                  "private_user_data": [
+                  "account_data": [
                     {
                       "type": "org.example.custom.config",
                       "content": {
diff --git a/api/client-server/v2_alpha/client-config.yaml b/api/client-server/v2_alpha/client-config.yaml
index 91be1686..76b6219e 100644
--- a/api/client-server/v2_alpha/client-config.yaml
+++ b/api/client-server/v2_alpha/client-config.yaml
@@ -24,7 +24,7 @@ paths:
       description: |-
         Set some config for the client. This config is only visible to the user
         that set the config. The config will be synced to clients in the
-        top-level ``private_user_data``.
+        top-level ``account_data``.
       security:
         - accessToken: []
       parameters:
@@ -63,7 +63,7 @@ paths:
       description: |-
         Set some config for the client on a given room. This config is only
         visible to the user that set the config. The config will be synced to
-        clients in the per-room ``private_user_data``.
+        clients in the per-room ``account_data``.
       security:
         - accessToken: []
       parameters:
diff --git a/api/client-server/v2_alpha/sync.yaml b/api/client-server/v2_alpha/sync.yaml
index e2016d68..f5c99508 100644
--- a/api/client-server/v2_alpha/sync.yaml
+++ b/api/client-server/v2_alpha/sync.yaml
@@ -233,7 +233,7 @@ paths:
                     }
                   ]
                 },
-                "private_user_data": {
+                "account_data": {
                   "events": [
                     {
                       "type": "org.example.custom.config",
diff --git a/specification/modules/client_config.rst b/specification/modules/client_config.rst
index 837f174d..581a5828 100644
--- a/specification/modules/client_config.rst
+++ b/specification/modules/client_config.rst
@@ -12,11 +12,11 @@ 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
+The client recieves the config as a event in the ``account_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``
+``account_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.