Merge pull request #3154 from matrix-org/travis/spec/knock-knock-whos…

…-there Add knocking to the spec
matrix-org · Apr 30, 2021 · 315f36c · 315f36c
2 parents 4f0825f + 5278027
commit 315f36c
Show file tree

Hide file tree

Showing 21 changed files with 793 additions and 106 deletions.
diff --git a/changelogs/client_server/newsfragments/3154.feature b/changelogs/client_server/newsfragments/3154.feature
@@ -0,0 +1 @@
+Add support for knocking, as per [MSC2403](https://github.com/matrix-org/matrix-doc/pull/2403).
diff --git a/changelogs/client_server/newsfragments/3154.new b/changelogs/client_server/newsfragments/3154.new
@@ -0,0 +1 @@
+Add `/knock` endpoint as per [MSC2403](https://github.com/matrix-org/matrix-doc/pull/2403).
diff --git a/changelogs/server_server/newsfragments/3154.feature b/changelogs/server_server/newsfragments/3154.feature
@@ -0,0 +1 @@
+Add support for knocking, as per [MSC2403](https://github.com/matrix-org/matrix-doc/pull/2403).
diff --git a/changelogs/server_server/newsfragments/3154.new b/changelogs/server_server/newsfragments/3154.new
@@ -0,0 +1 @@
+Add `/make_knock` and `/send_knock` endpoints as per [MSC2403](https://github.com/matrix-org/matrix-doc/pull/2403).
diff --git a/content/_index.md b/content/_index.md
@@ -327,12 +327,12 @@ sent to the room `!qporfwt:matrix.org`:
 Federation maintains *shared data structures* per-room between multiple
 homeservers. The data is split into `message events` and `state events`.
 
-Message events:  
+Message events:
 These describe transient 'once-off' activity in a room such as an
 instant messages, VoIP call setups, file transfers, etc. They generally
 describe communication activity.
 
-State events:  
+State events:
 These describe updates to a given piece of persistent information
 ('state') related to a room, such as the room's name, topic, membership,
 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
 discovered security vulnerabilities and age.
 
 Clients should not ask room administrators to upgrade their rooms if the
-room is running a stable version. Servers SHOULD use room version 6 as
+room is running a stable version. Servers SHOULD use **room version 6** as
 the default room version when creating new rooms.
 
 The available room versions are:
@@ -522,10 +522,11 @@ The available room versions are:
     signing key validity periods.
 -   [Version 6](/rooms/v6) - **Stable**. Alters several
     authorization rules for events.
+-   [Version 7](/rooms/v7) - **Stable**. Introduces knocking.
 
 ## Specification Versions
 
-The specification for each API is versioned in the form `rX.Y.Z`.  
+The specification for each API is versioned in the form `rX.Y.Z`.
 -   A change to `X` reflects a breaking change: a client implemented
     against `r1.0.0` may need changes to work with a server which
     supports (only) `r2.0.0`.