Skip to content

Commit 82947bb

Browse files
committed
Replace authorization with authorisation throughout the spec
The style guide requires en_GB, which spells authorisation with an s.
1 parent 2192bfa commit 82947bb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+193
-193
lines changed

content/application-service-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ this.
100100

101101
### Homeserver -> Application Service API
102102

103-
#### Authorization
103+
#### Authorisation
104104

105105
{{% changed-in v="1.4" %}}
106106

content/changelog/v1.14.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ No significant changes.
6363

6464
**Spec Clarifications**
6565

66-
- For room versions 6 and 7, clarify in the authorization rules that `m.federate` must be checked and that events with rejected auth events must be rejected, for parity with all the other room versions. ([#2065](https://github.com/matrix-org/matrix-spec/issues/2065))
66+
- For room versions 6 and 7, clarify in the authorisation rules that `m.federate` must be checked and that events with rejected auth events must be rejected, for parity with all the other room versions. ([#2065](https://github.com/matrix-org/matrix-spec/issues/2065))
6767
- Fix various typos throughout the specification. ([#2066](https://github.com/matrix-org/matrix-spec/issues/2066))
6868
- Refactor PDU definitions to reduce duplication. ([#2070](https://github.com/matrix-org/matrix-spec/issues/2070))
6969
- Clarify the maximum `depth` value for room versions 6, 7, 8, 9, 10, and 11. ([#2114](https://github.com/matrix-org/matrix-spec/issues/2114))

content/changelog/v1.3.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,12 @@ No significant changes.
108108

109109

110110
- Improve readability and understanding of the state resolution algorithms. ([#1037](https://github.com/matrix-org/matrix-spec/issues/1037), [#1042](https://github.com/matrix-org/matrix-spec/issues/1042), [#1043](https://github.com/matrix-org/matrix-spec/issues/1043), [#1120](https://github.com/matrix-org/matrix-spec/issues/1120))
111-
- Improve readability of the authorization rules. ([#1050](https://github.com/matrix-org/matrix-spec/issues/1050))
111+
- Improve readability of the authorisation rules. ([#1050](https://github.com/matrix-org/matrix-spec/issues/1050))
112112
- For room versions 8, 9, and 10: clarify which homeserver is required to sign the join event. ([#1093](https://github.com/matrix-org/matrix-spec/issues/1093))
113113
- Clarify that room versions 1 through 9 accept stringy power levels, as noted by [MSC3667](https://github.com/matrix-org/matrix-spec-proposals/pull/3667). ([#1099](https://github.com/matrix-org/matrix-spec/issues/1099))
114-
- For all room versions: Add `m.federate` to the authorization rules, as originally intended. ([#1103](https://github.com/matrix-org/matrix-spec/issues/1103))
114+
- For all room versions: Add `m.federate` to the authorisation rules, as originally intended. ([#1103](https://github.com/matrix-org/matrix-spec/issues/1103))
115115
- For room versions 2 through 10: More explicitly define the mainline of a power event and the mainline ordering of other events. ([#1107](https://github.com/matrix-org/matrix-spec/issues/1107))
116-
- For room versions 7, 8, 9, and 10: fix join membership authorization rules when `join_rule` is `knock`. ([#3737](https://github.com/matrix-org/matrix-spec-proposals/issues/3737))
116+
- For room versions 7, 8, 9, and 10: fix join membership authorisation rules when `join_rule` is `knock`. ([#3737](https://github.com/matrix-org/matrix-spec-proposals/issues/3737))
117117

118118

119119
## Appendices

content/changelog/v1.4.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ date: 2022-09-29
7373
<strong>Breaking Changes</strong>
7474

7575

76-
- Replace homeserver authorization approach with an `Authorization` header instead of `access_token` when talking to the application service, as per [MSC2832](https://github.com/matrix-org/matrix-spec-proposals/pull/2832). ([#1200](https://github.com/matrix-org/matrix-spec/issues/1200))
76+
- Replace homeserver authorisation approach with an `Authorization` header instead of `access_token` when talking to the application service, as per [MSC2832](https://github.com/matrix-org/matrix-spec-proposals/pull/2832). ([#1200](https://github.com/matrix-org/matrix-spec/issues/1200))
7777

7878

7979
<strong>Spec Clarifications</strong>

content/client-server-api/_index.md

Lines changed: 70 additions & 70 deletions
Large diffs are not rendered by default.

content/rooms/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ The available room versions are:
6868
- [Version 5](/rooms/v5) - **Stable**. Introduces enforcement of
6969
signing key validity periods.
7070
- [Version 6](/rooms/v6) - **Stable**. Alters several
71-
authorization rules for events.
71+
authorisation rules for events.
7272
- [Version 7](/rooms/v7) - **Stable**. Introduces knocking.
7373
- [Version 8](/rooms/v8) - **Stable**. Adds a join rule to allow members
7474
of another room to join without invite.
@@ -85,7 +85,7 @@ The available room versions are:
8585

8686
Room versions are used to change properties of rooms that may not be
8787
compatible with other servers. For example, changing the rules for event
88-
authorization would cause older servers to potentially end up in a
88+
authorisation would cause older servers to potentially end up in a
8989
split-brain situation due to not understanding the new rules.
9090

9191
A room version is defined as a string of characters which MUST NOT

content/rooms/fragments/v1-auth-rules.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
The types of state events that affect authorization are:
2+
The types of state events that affect authorisation are:
33

44
- [`m.room.create`](/client-server-api#mroomcreate)
55
- [`m.room.member`](/client-server-api#mroommember)

content/rooms/fragments/v2-state-res.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@ events: for events *x* and *y*, *x* &lt; *y* if
123123
The *iterative auth checks algorithm* takes as input an initial room
124124
state and a sorted list of state events, and constructs a new room state
125125
by iterating through the event list and applying the state event to the
126-
room state if the state event is allowed by the [authorization
127-
rules](/server-server-api#authorization-rules).
128-
If the state event is not allowed by the authorization rules, then the
126+
room state if the state event is allowed by the [authorisation
127+
rules](/server-server-api#authorisation-rules).
128+
If the state event is not allowed by the authorisation rules, then the
129129
event is ignored. If a `(event_type, state_key)` key that is required
130-
for checking the authorization rules is not present in the state, then
130+
for checking the authorisation rules is not present in the state, then
131131
the appropriate state event from the event's `auth_events` is used if
132132
the auth event is not rejected.
133133

content/rooms/fragments/v3-auth-rules.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ in the same respect, so does not need a signature from that server.
77
The event must still be signed by the server denoted by the `sender` property,
88
however.
99

10-
The types of state events that affect authorization are:
10+
The types of state events that affect authorisation are:
1111

1212
- [`m.room.create`](/client-server-api#mroomcreate)
1313
- [`m.room.member`](/client-server-api#mroommember)

content/rooms/fragments/v3-handling-redactions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
---
33
{{% added-in v=3 %}} In room versions 1 and 2, redactions were
4-
explicitly part of the [authorization rules](/rooms/v1/#authorization-rules)
4+
explicitly part of the [authorisation rules](/rooms/v1/#authorisation-rules)
55
under Rule 11. As of room version 3, these conditions no longer exist as
6-
represented by [this version's authorization rules](#authorization-rules).
6+
represented by [this version's authorisation rules](#authorisation-rules).
77

8-
While redactions are always accepted by the authorization rules for
8+
While redactions are always accepted by the authorisation rules for
99
events, they should not be sent to clients until both the redaction
1010
event and the event the redaction affects have been received, and can
1111
be validated. If both events are valid and have been seen by the server,

0 commit comments

Comments
 (0)