Merge 43ff9d0e6f into b5ee6adc0f

* Remove extraneous v11 tag in v12 auth rules

* Changelog to copy #2193

changelogs/room_versions/newsfragments/2199.feature

@@ -0,0 +1 @@
+Add [room version 12](/rooms/v12) as per [MSC4304](https://github.com/matrix-org/matrix-spec-proposals/pull/4304).

changelogs/server_server/newsfragments/2191.clarification

@@ -0,0 +1 @@
+Clarify what the minimum_valid_until_ts field means when it is set in key queries.

content/rooms/v12.md

@@ -131,8 +131,7 @@ The rules are as follows:
         1.  If the event is not validly signed by the homeserver of the user ID denoted
             by the key, reject.
     3.  If `membership` is `join`:
-        1.  {{% changed-in v=11 %}}
+        1.  If the only previous event is an `m.room.create` and the
-            If the only previous event is an `m.room.create` and the
             `state_key` is the sender of the `m.room.create`, allow.
         2.  If the `sender` does not match `state_key`, reject.
         3.  If the `sender` is banned, reject.

data/api/server-server/keys_query.yaml

@@ -34,8 +34,8 @@ paths:
         - in: query
           name: minimum_valid_until_ts
           description: |-
-            A millisecond POSIX timestamp in milliseconds indicating when the returned
+            A millisecond POSIX timestamp indicating until when the returned
-            certificates will need to be valid until to be useful to the requesting server.
+            keys MUST at least be valid.
 
             If not supplied, the current time as determined by the notary server is used.
           required: false
@@ -98,9 +98,8 @@ paths:
                           type: integer
                           format: int64
                           description: |-
-                            A millisecond POSIX timestamp in milliseconds indicating when
+                            A millisecond POSIX timestamp indicating until when
-                            the returned certificates will need to be valid until to be
+                            the returned keys MUST at least be valid.
-                            useful to the requesting server.
 
                             If not supplied, the current time as determined by the notary
                             server is used.