From 3aba6e3eebc4a75051ab38046cb9b5815d84fc85 Mon Sep 17 00:00:00 2001 From: Carolin Beer Date: Sun, 15 Dec 2019 14:37:10 +0100 Subject: [PATCH] Change state_type to event_type I couldn't find any other reference to a state_type within the entire specification. I assume this is supposed to be the event_type? This aligns with the description of changes resulting from a state update. --- specification/rooms/v1.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/rooms/v1.rst b/specification/rooms/v1.rst index a720b41a..10eee54d 100644 --- 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.