Merge 72b34b863f into 8a2c58b1b1

Typo "not" -> "no" (#2121 )
* Typo "not" -> "no" Signed-off-by: Andy Balaam <andy.balaam@matrix.org> --------- Signed-off-by: Andy Balaam <andy.balaam@matrix.org>
2026-03-02 17:54:09 +01:00 · 2025-03-28 16:31:19 -04:00 · 2025-03-28 14:13:17 +00:00 · 2025-01-28 19:03:28 +00:00 · 2025-01-28 19:02:09 +00:00
5 changed files with 13 additions and 3 deletions
--- a/changelogs/client_server/newsfragments/2121.clarification
+++ b/changelogs/client_server/newsfragments/2121.clarification
@ -0,0 +1 @@
+Fix various typos throughout the specification.
--- a/changelogs/server_server/newsfragments/2067.clarification
+++ b/changelogs/server_server/newsfragments/2067.clarification
@ -0,0 +1 @@
+Add a note to the invite endpoints that invites to local users may be received twice over federation if the homeserver is already in the room.
--- a/content/client-server-api/modules/secrets.md
+++ b/content/client-server-api/modules/secrets.md
@ -58,7 +58,7 @@ available on all their clients. Unless the user specifies otherwise,
 clients will try to use the default key to decrypt secrets.

 Clients that want to present a simplified interface to users by not supporting
-multiple keys should use the default key if one is specified. If not default
+multiple keys should use the default key if one is specified. If no default
 key is specified, the client may behave as if there is no key is present at
 all. When such a client creates a key, it should mark that key as being the
 default key.
--- a/data/api/server-server/invites-v1.yaml
+++ b/data/api/server-server/invites-v1.yaml
@ -20,7 +20,7 @@ paths:
    put:
      summary: Invites a remote user to a room
      description: |-
-        Invites a remote user to a room. Once the event has been  signed by both the inviting
+        Invites a remote user to a room. Once the event has been signed by both the inviting
        homeserver and the invited homeserver, it can be sent to all of the servers in the
        room by the inviting homeserver.

@ -32,6 +32,10 @@ paths:
        [room version specification](/rooms) for precise event formats. **The request and response
        bodies here describe the common event fields in more detail and may be missing other
        required fields for a PDU.**
+
+        Also note that if the remote homeserver is already in the room, it will receive the
+        invite event twice; once through this endpoint, and again through a [federation
+        transaction](https://spec.matrix.org/v1.13/server-server-api/#transactions).
      operationId: sendInviteV1
      security:
        - signedRequest: []
--- a/data/api/server-server/invites-v2.yaml
+++ b/data/api/server-server/invites-v2.yaml
@ -24,7 +24,7 @@ paths:
        This API is nearly identical to the v1 API with the exception of the request
        body being different, and the response format fixed.

-        Invites a remote user to a room. Once the event has been  signed by both the inviting
+        Invites a remote user to a room. Once the event has been signed by both the inviting
        homeserver and the invited homeserver, it can be sent to all of the servers in the
        room by the inviting homeserver.

@ -36,6 +36,10 @@ paths:
        [room version specification](/rooms) for precise event formats. **The request and response
        bodies here describe the common event fields in more detail and may be missing other
        required fields for a PDU.**
+
+        Also note that if the remote homeserver is already in the room, it will receive the
+        invite event twice; once through this endpoint, and again through a [federation
+        transaction](https://spec.matrix.org/v1.13/server-server-api/#transactions).
      operationId: sendInviteV2
      security:
        - signedRequest: []
Author	SHA1	Message	Date
Andrew Morgan	a0fa5bbecc	Merge `72b34b863f` into `8a2c58b1b1`	2025-03-28 16:31:19 -04:00
Andy Balaam	8a2c58b1b1	Typo "not" -> "no" (#2121 ) Some checks failed Spec / 🔎 Validate OpenAPI specifications (push) Has been cancelled Details Spec / 🔎 Check Event schema examples (push) Has been cancelled Details Spec / 🔎 Check OpenAPI definitions examples (push) Has been cancelled Details Spec / 🔎 Check JSON Schemas inline examples (push) Has been cancelled Details Spec / ⚙️ Calculate baseURL for later jobs (push) Has been cancelled Details Spec / 📢 Run towncrier for changelog (push) Has been cancelled Details Spell Check / Spell Check with Typos (push) Has been cancelled Details Spec / 🐍 Build OpenAPI definitions (push) Has been cancelled Details Spec / 📖 Build the spec (push) Has been cancelled Details Spec / 🔎 Validate generated HTML (push) Has been cancelled Details Spec / 📖 Build the historical backup spec (push) Has been cancelled Details * Typo "not" -> "no" Signed-off-by: Andy Balaam <andy.balaam@matrix.org> --------- Signed-off-by: Andy Balaam <andy.balaam@matrix.org>	2025-03-28 14:13:17 +00:00
Andrew Morgan	72b34b863f	newsfile	2025-01-28 19:03:28 +00:00
Andrew Morgan	4d84d75bb6	Add a note to the federation invite endpoints that invites can be sent twice As this may be non-obvious when implementing behaviour that is triggered by an incoming invite event. See https://github.com/matrix-org/matrix-spec/issues/2062 for more context.	2025-01-28 19:02:09 +00:00
				`@ -0,0 +1 @@`
				`Fix various typos throughout the specification.`
				`@ -0,0 +1 @@`
				`Add a note to the invite endpoints that invites to local users may be received twice over federation if the homeserver is already in the room.`