Skip to content

Commit 457f399

Browse files
turt2liverichvdh
authored andcommitted
Merge pull request #3154 from matrix-org/travis/spec/knock-knock-whos-there
Add knocking to the spec
2 parents ec9ea2b + 01a7f06 commit 457f399

File tree

21 files changed

+793
-106
lines changed

21 files changed

+793
-106
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add support for knocking, as per [MSC2403](https://github.com/matrix-org/matrix-doc/pull/2403).
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add `/knock` endpoint as per [MSC2403](https://github.com/matrix-org/matrix-doc/pull/2403).
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add support for knocking, as per [MSC2403](https://github.com/matrix-org/matrix-doc/pull/2403).
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add `/make_knock` and `/send_knock` endpoints as per [MSC2403](https://github.com/matrix-org/matrix-doc/pull/2403).

content/_index.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -327,12 +327,12 @@ sent to the room `!qporfwt:matrix.org`:
327327
Federation maintains *shared data structures* per-room between multiple
328328
homeservers. The data is split into `message events` and `state events`.
329329

330-
Message events:
330+
Message events:
331331
These describe transient 'once-off' activity in a room such as an
332332
instant messages, VoIP call setups, file transfers, etc. They generally
333333
describe communication activity.
334334

335-
State events:
335+
State events:
336336
These describe updates to a given piece of persistent information
337337
('state') related to a room, such as the room's name, topic, membership,
338338
participating servers, etc. State is modelled as a lookup table of
@@ -505,7 +505,7 @@ stable and unstable periodically for a variety of reasons, including
505505
discovered security vulnerabilities and age.
506506

507507
Clients should not ask room administrators to upgrade their rooms if the
508-
room is running a stable version. Servers SHOULD use room version 6 as
508+
room is running a stable version. Servers SHOULD use **room version 6** as
509509
the default room version when creating new rooms.
510510

511511
The available room versions are:
@@ -522,10 +522,11 @@ The available room versions are:
522522
signing key validity periods.
523523
- [Version 6](/rooms/v6) - **Stable**. Alters several
524524
authorization rules for events.
525+
- [Version 7](/rooms/v7) - **Stable**. Introduces knocking.
525526

526527
## Specification Versions
527528

528-
The specification for each API is versioned in the form `rX.Y.Z`.
529+
The specification for each API is versioned in the form `rX.Y.Z`.
529530
- A change to `X` reflects a breaking change: a client implemented
530531
against `r1.0.0` may need changes to work with a server which
531532
supports (only) `r2.0.0`.

0 commit comments

Comments
 (0)