Merge remote-tracking branch 'origin/main' into rav/history_sharing

.github/CODEOWNERS

@@ -1 +1 @@
-*       @matrix-org/spec-core-team
+*       @matrix-org/spec-core-team @zecakeh

changelogs/identity_service/newsfragments/2401.clarification

@@ -0,0 +1 @@
+Fix various typos throughout the specification.

changelogs/internal/newsfragments/2400.clarification

@@ -0,0 +1 @@
+Update CODEOWNERS file.

changelogs/room_versions/newsfragments/2401.clarification

@@ -0,0 +1 @@
+Fix various typos throughout the specification.

content/appendices.md

@@ -51,7 +51,7 @@ interoperability.
 
 URL-safe unpadded Base64 is identical to standard unpadded Base64, except that
 it uses `-` (minus) as the 62nd character in the alphabet, and `_` (underscore)
-as the 63rd.
+as the 63rd. This matches [RFC4648’s definition of URL-safe base64](https://tools.ietf.org/html/rfc4648#section-5).
 
 ## Binary data
 

content/identity-service-api.md

@@ -276,9 +276,8 @@ internal state of the hash function.
 
 After formatting each query, the string is run through SHA-256 as
 defined by [RFC 4634](https://tools.ietf.org/html/rfc4634). The
-resulting bytes are then encoded using URL-Safe [Unpadded
+resulting bytes are then encoded using [URL-Safe unpadded
-Base64](/appendices#unpadded-base64) (similar to [room version
+Base64](/appendices/#url-safe-unpadded-base64).
-4's event ID format](/rooms/v4#event-ids)).
 
 An example set of queries when using the pepper `matrixrocks` would be:
 

content/rooms/fragments/v4-event-ids.md

@@ -2,11 +2,8 @@
 ---
 {{% added-in v=4 %}} The event ID is the [reference
 hash](/server-server-api#calculating-the-reference-hash-for-an-event) of
-the event encoded using a variation of [Unpadded
+the event encoded using [URL-safe unpadded
-Base64](/appendices#unpadded-base64) which replaces the 62nd and
+Base64](/appendices/#url-safe-unpadded-base64).
-63rd characters with `-` and `_` instead of using `+` and `/`. This
-matches [RFC4648's definition of URL-safe
-base64](https://tools.ietf.org/html/rfc4648#section-5).
 
 Event IDs are still prefixed with `$` and might result in looking like
 `$Rqnc-F-dvnEYJTyHq_iKxU2bZ1CI92-kuZq3a5lr5Zg`.

data/api/identity/v2_store_invite.yaml

@@ -156,7 +156,7 @@ paths:
                         public_key:
                           type: string
                           description: |
-                            The public key, encoded using standard or URL-safe [unpadded Base64](/appendices/#unpadded-base64).
+                            The public key, encoded using [standard unpadded Base64](/appendices/#unpadded-base64) or [URL-safe unpadded Base64](/appendices/#url-safe-unpadded-base64).
                         key_validity_url:
                           type: string
                           description: |