Merge 827ee5f880 into 23ff7f1343

assets/scss/_styles_project.scss

@@ -316,19 +316,13 @@ Custom SCSS for the Matrix spec
   h2 {
     font-weight: $font-weight-bold;
     font-size: 1.3rem;
-    margin: 1.5rem 0 1rem 0;
+    margin: 3rem 0 .5rem 0;
   }
 
   h3 {
     font-weight: $font-weight-bold;
     font-size: 1.1rem;
-    margin: 1.5rem 0 1rem 0;
+    margin: 1.5rem 0 .75rem 0;
-
-  }
-
-  /* Reduce top margin of h3 if previous sibling is a h2 */
-  h2 + h3 {
-    margin-top: 1rem;
   }
 
   hr {
@@ -373,6 +367,11 @@ Custom SCSS for the Matrix spec
       }
     }
 
+    // add some space between two tables when they are right next to each other
+    & + table {
+        margin-top: 4rem;
+    }
+
     caption {
       caption-side: top;
       color: $dark;
@@ -444,17 +443,6 @@ Custom SCSS for the Matrix spec
     }
   }
 
-  /* Have consistent spacing around tables and examples */
-  table, .highlight {
-    margin-top: 0;
-    margin-bottom: 2rem;
-
-    /* We don't need the margin on the last child of the .rendered-data block */
-    &:last-child {
-      margin-bottom: 0;
-    } 
-  }
-
   pre {
     border: 0;
     border-left: solid 5px $secondary;

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.

changelogs/client_server/newsfragments/2077.clarification

@@ -1 +0,0 @@
-Fix the example of the `GET /sync` endpoint and the `m.room.member` example used in several places.

changelogs/internal/newsfragments/2081.clarification

@@ -1 +0,0 @@
-Adjust margins in rendered endpoints.

data/api/client-server/sync.yaml

@@ -441,57 +441,17 @@ paths:
                           "state": {
                             "events": [
                               {
-                                "content": {
+                                "$ref": "../../event-schemas/examples/m.room.member.yaml"
-                                  "avatar_url": "mxc://example.org/SFHyPlCeYUSFFxlgbQYZmoEoe",
-                                  "displayname": "Example user",
-                                  "membership": "join"
-                                },
-                                "event_id": "$143273976499sgjks:example.org",
-                                "origin_server_ts": 1432735824653,
-                                "sender": "@example:example.org",
-                                "state_key": "@example:example.org",
-                                "type": "m.room.member",
-                                "unsigned": {
-                                  "age": 45603,
-                                  "membership": "join"
-                                }
                               }
                             ]
                           },
                           "timeline": {
                             "events": [
                               {
-                                "content": {
+                                "$ref": "../../event-schemas/examples/m.room.member.yaml"
-                                  "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
-                                  "displayname": "Alice Margatroid",
-                                  "membership": "join",
-                                  "reason": "Looking for support"
-                                },
-                                "event_id": "$143273582443PhrSn:example.org",
-                                "origin_server_ts": 1432735824653,
-                                "sender": "@alice:example.org",
-                                "state_key": "@alice:example.org",
-                                "type": "m.room.member",
-                                "unsigned": {
-                                  "age": 1234,
-                                  "membership": "join"
-                                }
                               },
                               {
-                                "content": {
+                                "$ref": "../../event-schemas/examples/m.room.message$m.text.yaml"
-                                  "body": "This is an example text message",
-                                  "format": "org.matrix.custom.html",
-                                  "formatted_body": "<b>This is an example text message</b>",
-                                  "msgtype": "m.text"
-                                },
-                                "event_id": "$143273582443PhrSn:example.org",
-                                "origin_server_ts": 1432735824653,
-                                "sender": "@example:example.org",
-                                "type": "m.room.message",
-                                "unsigned": {
-                                  "age": 1234,
-                                  "membership": "join"
-                                }
                               }
                             ],
                             "limited": true,

data/event-schemas/examples/m.room.member.yaml

@@ -1,7 +1,6 @@
 {
   "$ref": "core/state_event.json",
   "state_key": "@alice:example.org",
-  "sender": "@alice:example.org",
   "type": "m.room.member",
   "content": {
     "membership": "join",

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: