From 902f25ef4aab3187ac1cac442bac64ff5ac83609 Mon Sep 17 00:00:00 2001
From: Daniel Wagner-Hall <daniel@matrix.org>
Date: Tue, 23 Feb 2016 14:43:36 +0000
Subject: [PATCH 1/2] Include newline before table headings

---
 templating/matrix_templates/templates/events.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templating/matrix_templates/templates/events.tmpl b/templating/matrix_templates/templates/events.tmpl
index 858f5ef6..f7a8263e 100644
--- a/templating/matrix_templates/templates/events.tmpl
+++ b/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"]) }}

From 016ccf454437b16c22000e6ec15cfb33d696a150 Mon Sep 17 00:00:00 2001
From: Daniel Wagner-Hall <daniel@matrix.org>
Date: Tue, 23 Feb 2016 15:19:45 +0000
Subject: [PATCH 2/2] Remove signed object which shouldn't exist

---
 api/client-server/joining.yaml | 45 ++++++++++++++--------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/api/client-server/joining.yaml b/api/client-server/joining.yaml
index 4cf47eae..46289c2a 100644
--- a/api/client-server/joining.yaml
+++ b/api/client-server/joining.yaml
@@ -51,14 +51,12 @@ paths:
             example: |-
               {
                 "third_party_signed": {
-                  "signed": {
-                    "sender": "@cat:the.hat",
-                    "mxid": "@green:eggs.ham",
-                    "token": "random8nonce",
-                    "signatures": {
-                      "horton.hears": {
-                        "ed25519:0": "some9signature"
-                      }
+                  "sender": "@cat:the.hat",
+                  "mxid": "@green:eggs.ham",
+                  "token": "random8nonce",
+                  "signatures": {
+                    "horton.hears": {
+                      "ed25519:0": "some9signature"
                     }
                   }
                 }
@@ -69,25 +67,20 @@ paths:
                 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:
+                  sender:
+                    type: string
+                    description: The Matrix ID of the user who issued the invite.
+                  mxid:
+                    type: string
+                    description: The Matrix ID of the invitee.
+                  token:
+                    type: string
+                    description: The state key of the m.third_party_invite event.
+                  signatures:
                     type: object
-                    title: Signed
-                    properties:
-                      sender:
-                        type: string
-                        description: The Matrix ID of the user who issued the invite.
-                      mxid:
-                        type: string
-                        description: The Matrix ID of the invitee.
-                      token:
-                        type: string
-                        description: The state key of the m.third_party_invite event.
-                      signatures:
-                        type: object
-                        description: A signatures object containing a signature of the entire signed object.
-                        title: Signatures
-                    required: ["sender", "mxid", "token", "signatures"]
-                required: ["signed"]
+                    description: A signatures object containing a signature of the entire signed object.
+                    title: Signatures
+                required: ["sender", "mxid", "token", "signatures"]
       responses:
         200:
           description: |-