Merge pull request #2372 from matrix-org/jryans/clarify-cross-signing-examples

Clarify cross-signing examples

proposals/1756-cross-signing.md

@@ -216,12 +216,12 @@ response:
 }
 ```
 
-Similarly, the federation endpoints `GET /user/keys/query` and `POST
+Similarly, the federation endpoints `POST /user/keys/query` and `POST
 /user/devices/{userId}` will include the master and self-signing keys.  (It
 will not include the user-signing key because it is not intended to be visible
 to other users.)
 
-`POST /keys/query`
+`POST /user/keys/query`
 
 ``` json
 {
@@ -432,27 +432,31 @@ response:
       }
     }
   },
-  "master_key": {
+  "master_keys": {
-    "user_id": "@alice:example.com",
+    "@alice:example.com": {
-    "usage": ["master"],
+      "user_id": "@alice:example.com",
-    "keys": {
+      "usage": ["master"],
-      "ed25519:base64+master+public+key": "base64+master+public+key"
+      "keys": {
-    },
+        "ed25519:base64+master+public+key": "base64+master+public+key"
-    "signatures": {
+      },
-      "@alice:example.com": {
+      "signatures": {
-        "ed25519:HIJKLMN": "base64+signature+of+master+key"
+        "@alice:example.com": {
+          "ed25519:HIJKLMN": "base64+signature+of+master+key"
+        }
       }
     }
   },
-  "self_signing_key": {
+  "self_signing_keys": {
-    "user_id": "@alice:example.com",
+    "@alice:example.com": {
-    "usage": ["self_signing"],
+      "user_id": "@alice:example.com",
-    "keys": {
+      "usage": ["self_signing"],
-      "ed25519:base64+self+signing+public+key": "base64+self+signing+public+key"
+      "keys": {
-    },
+        "ed25519:base64+self+signing+public+key": "base64+self+signing+public+key"
-    "signatures": {
+      },
-      "@alice:example.com": {
+      "signatures": {
-        "ed25519:base64+master+public+key": "base64+signature"
+        "@alice:example.com": {
+          "ed25519:base64+master+public+key": "base64+signature"
+        }
       }
     }
   }