Merge d9d14dcfe2 into 9c014a9045

Signed-off-by: tusooa <tusooa@kazv.moe>
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>

changelogs/client_server/newsfragments/2344.clarification

@@ -0,0 +1 @@
+Clarify SAS commitment calculation for `m.key.verification.accept` messages.

changelogs/server_server/newsfragments/2334.clarification

@@ -0,0 +1 @@
+Clarify that server ACLs are case-insensitive.

data/event-schemas/schema/m.key.verification.accept.yaml

@@ -44,7 +44,8 @@ properties:
         description: |-
           The hash (encoded as unpadded base64) of the concatenation of the device's
           ephemeral public key (encoded as unpadded base64) and the canonical JSON
-          representation of the `m.key.verification.start` message.
+          representation of the `content` object of the `m.key.verification.start`
+          message.
       m.relates_to:
         $ref: m.key.verification.m.relates_to.yaml
     required:

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

@@ -62,8 +62,9 @@ properties:
       allow:
         type: array
         description: |-
-          The server names to allow in the room, excluding any port information.
+          The case-insensitive [glob expressions](/appendices#glob-style-matching) that are
-          Each entry is interpreted as a [glob-style pattern](/appendices#glob-style-matching).
+          evaluated against server names excluding any port information to determine the servers
+          to allow in the room.
 
           **This defaults to an empty list when not provided, effectively disallowing
           every server.**
@@ -72,8 +73,9 @@ properties:
       deny:
         type: array
         description: |-
-          The server names to disallow in the room, excluding any port information.
+          The case-insensitive [glob expressions](/appendices#glob-style-matching) that are
-          Each entry is interpreted as a [glob-style pattern](/appendices#glob-style-matching).
+          evaluated against server names excluding any port information to determine the servers
+          to disallow in the room.
 
           This defaults to an empty list when not provided.
         items: