From 65066a76b36de8595bf5b67e075c631c8e77d5b1 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Mon, 26 Oct 2015 18:30:04 +0000
Subject: [PATCH] Add the m.tags event to a ``private_user_data`` key rather
 than including it under the ``ephemeral`` key

---
 api/client-server/v2_alpha/sync.yaml | 17 ++++++++++++++++-
 specification/modules/tags.rst       |  4 ++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/api/client-server/v2_alpha/sync.yaml b/api/client-server/v2_alpha/sync.yaml
index 266f27bc..3a1d79db 100644
--- a/api/client-server/v2_alpha/sync.yaml
+++ b/api/client-server/v2_alpha/sync.yaml
@@ -121,6 +121,14 @@ paths:
                             e.g. typing.
                           allOf:
                             - $ref: "definitions/event_batch.json"
+                        private_user_data:
+                          title: Private User Data
+                          type: object
+                          description: |-
+                            The private data that this user has attached to
+                            this room.
+                          allOf:
+                          - $ref: "definitions/event_batch.json"
                   invited:
                     title: Invited
                     type: object
@@ -253,11 +261,18 @@ paths:
                       "ephemeral": {
                         "events": [
                           {
-                            "room_id": "!726s6s6q:example.com",
                             "type": "m.typing",
                             "content": {"user_ids": ["@alice:example.com"]}
                           }
                         ]
+                      },
+                      "private_user_data": {
+                        "events": [
+                          {
+                            "type": "m.tags",
+                            "content": {"tags": ["work"]}
+                          }
+                        ]
                       }
                     }
                   },
diff --git a/specification/modules/tags.rst b/specification/modules/tags.rst
index 76fff125..1a364a43 100644
--- a/specification/modules/tags.rst
+++ b/specification/modules/tags.rst
@@ -10,8 +10,8 @@ user that set them but are shared across all their devices.
 Events
 ------
 
-The tags on a room are passed as single ``m.tag`` event in the ``ephemeral``
-section of a v2 room sync.
+The tags on a room are passed as single ``m.tag`` event in the
+``private_user_data`` section of a room in v2 sync.
 
 {{m_tag_event}}