Merge pull request #2386 from carbeer/patch-1

Change state_type to event_type
5 years ago · f11f77f33b
parent c823bdbf70 3aba6e3eeb
commit f11f77f33b
1 changed files with 1 additions and 1 deletions
--- a/specification/rooms/v1.rst
+++ b/specification/rooms/v1.rst
@ -94,7 +94,7 @@ results of the resolution so far.
  passes authentication in :math:`R` and add it to :math:`R`.

 A *conflict* occurs between states where those states have different
-``event_ids`` for the same ``(state_type, state_key)``. The events thus
+``event_ids`` for the same ``(event_type, state_key)``. The events thus
 affected are said to be *conflicting* events.