Merge branch 'main' into refresh_token_spec

data/api/client-server/definitions/client_event_without_room_id.yaml

@@ -38,6 +38,10 @@ properties:
       Present if, and only if, this event is a *state* event. The key making
       this piece of state unique in the room. Note that it is often an empty
       string.
+
+      State keys starting with an `@` are reserved for referencing user IDs, such
+      as room members. With the exception of a few events, state events set with a
+      given user's ID as the state key MUST only be set by that user.
     type: string
     example: '@user:example.org'
   sender:

data/api/client-server/room_state.yaml

@@ -114,7 +114,7 @@ paths:
 
             Some example error codes include:
 
-            * `M_INVALID_PARAMETER`: One or more aliases within the `m.room.canonical_alias`
+            * `M_INVALID_PARAM`: One or more aliases within the `m.room.canonical_alias`
               event have invalid syntax.
 
             * `M_BAD_ALIAS`: One or more aliases within the `m.room.canonical_alias` event

data/api/server-server/definitions/keys.yaml

@@ -88,9 +88,10 @@ properties:
     type: integer
     format: int64
     description: |-
-      POSIX timestamp when the list of valid keys should be refreshed. This field MUST
-      be ignored in room versions 1, 2, 3, and 4. Keys used beyond this timestamp MUST
-      be considered invalid, depending on the [room version specification](/rooms).
+      POSIX timestamp in milliseconds when the list of valid keys should be refreshed.
+      This field MUST be ignored in room versions 1, 2, 3, and 4. Keys used beyond this
+      timestamp MUST be considered invalid, depending on the
+      [room version specification](/rooms).
 
       Servers MUST use the lesser of this field and 7 days into the future when
       determining if a key is valid. This is to avoid a situation where an attacker