Merge branch 'master' of github.com:matrix-org/matrix-doc

api/client-server/joining.yaml

@@ -51,7 +51,6 @@ paths:
             example: |-
               {
                 "third_party_signed": {
-                  "signed": {
                   "sender": "@cat:the.hat",
                   "mxid": "@green:eggs.ham",
                   "token": "random8nonce",
@@ -62,16 +61,11 @@ paths:
                   }
                 }
               }
-              }
             properties:
               third_party_signed:
                 type: object
                 title: ThirdPartySigned
                 description: A signature of an ``m.third_party_invite`` token to prove that this user owns a third party identity which has been invited to the room.
-                properties:
-                  signed:
-                    type: object
-                    title: Signed
                 properties:
                   sender:
                     type: string
@@ -87,7 +81,6 @@ paths:
                     description: A signatures object containing a signature of the entire signed object.
                     title: Signatures
                 required: ["sender", "mxid", "token", "signatures"]
-                required: ["signed"]
       responses:
         200:
           description: |-

templating/matrix_templates/templates/events.tmpl

@@ -6,7 +6,7 @@
     {{event.typeof_info}}
 
 {{event.desc | wrap(80)}}
-{% for table in event.content_fields -%}
+{% for table in event.content_fields %}
 {{"``"+table.title+"``" if table.title else "" }}
 
 {{ tables.paramtable(table.rows, [(table.title or "Content") ~ " Key", "Type", "Description"]) }}