Merge c94b54dab1 into c39c7d0680

changelogs/client_server/newsfragments/2068.clarification

@@ -1 +0,0 @@
-Clarify behaviour when the `topic` key of a `m.room.topic` event is absent, null, or empty.

data/event-schemas/schema/m.room.topic.yaml

@@ -1,14 +1,7 @@
 ---
 allOf:
   - $ref: core-event-schema/state_event.yaml
-description: |- 
+description: 'A topic is a short message detailing what is currently being discussed in the room.  It can also be used as a way to display extra information about the room, which may not be suitable for the room name. The room topic can also be set when creating a room using `/createRoom` with the `topic` key.'
-    A topic is a short message detailing what is currently being discussed in the room.
-    It can also be used as a way to display extra information about the room, which may not
-    be suitable for the room name.
-    The room topic can also be set when creating a room using `/createRoom` with the `topic` key.'
-    
-    If the `topic` property is absent, null, or empty then the topic is unset. In other words,
-    an empty `topic` property effectively resets the room to having no topic.
 properties:
   content:
     properties: