Skip to content

Commit 9758286

Browse files
uhoregrichvdh
authored andcommitted
Merge pull request #3207 from toadjaune/patch-2
Fix a typo in event soft rejection schema
2 parents 4435e7f + f0ad2e5 commit 9758286

File tree

2 files changed

+20
-19
lines changed

2 files changed

+20
-19
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix various typos throughout the specification.

content/server-server-api.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -500,15 +500,15 @@ Example
500500

501501
As an example consider the event graph:
502502

503-
A
504-
/
503+
A
504+
/
505505
B
506506

507507
where `B` is a ban of a user `X`. If the user `X` tries to set the topic
508508
by sending an event `C` while evading the ban:
509509

510-
A
511-
/ \
510+
A
511+
/ \
512512
B C
513513

514514
servers that receive `C` after `B` should soft fail event `C`, and so
@@ -518,11 +518,11 @@ will neither relay `C` to its clients nor send any events referencing
518518
If later another server sends an event `D` that references both `B` and
519519
`C` (this can happen if it received `C` before `B`):
520520

521-
A
522-
/ \
521+
A
522+
/ \
523523
B C
524-
\ /
525-
D
524+
\ /
525+
D
526526

527527
then servers will handle `D` as normal. `D` is sent to the servers'
528528
clients (assuming `D` passes auth checks). The state at `D` may resolve
@@ -539,18 +539,18 @@ state of the `C` branch.
539539

540540
Let's go back to the graph before `D` was sent:
541541

542-
A
543-
/ \
542+
A
543+
/ \
544544
B C
545545

546546
If all the servers in the room saw `B` before `C` and so soft fail `C`,
547547
then any new event `D'` will not reference `C`:
548548

549-
A
550-
/ \
549+
A
550+
/ \
551551
B C
552552
|
553-
D
553+
D'
554554

555555
#### Retrieving event authorization information
556556

@@ -584,15 +584,15 @@ state.
584584
For example, consider the following event graph (where the oldest event,
585585
E0, is at the top):
586586

587-
E0
588-
|
589-
E1
590-
/ \
587+
E0
588+
|
589+
E1
590+
/ \
591591
E2 E4
592592
| |
593593
E3 |
594-
\ /
595-
E5
594+
\ /
595+
E5
596596

597597
Suppose E3 and E4 are both `m.room.name` events which set the name of
598598
the room. What should the name of the room be at E5?

0 commit comments

Comments
 (0)