From cf11965a8ee6c9bbe2de6e107b9291ecf666b8aa Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 6 Feb 2019 22:15:13 -0700 Subject: [PATCH 1/2] Change notice about room v2's scope to represent reality Fixes https://github.com/matrix-org/matrix-doc/issues/1851 --- specification/rooms/v2.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/specification/rooms/v2.rst b/specification/rooms/v2.rst index 7ad7668c..6188966a 100644 --- a/specification/rooms/v2.rst +++ b/specification/rooms/v2.rst @@ -27,9 +27,8 @@ Server implementation components details contained here, and can safely ignore their presence. -The algorithms defined here should only apply to version 2 rooms. Other algorithms -may be used by other room versions, and as such servers should be aware of which -version room they are dealing with prior to executing a given algorithm. +Room version 2 uses the base compoennts of `room version 1 `_, changing +only the state resolution algorithm. State resolution From 0ed0fee26147af548d2684f25ed8aa06028fdc59 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 7 Feb 2019 08:09:35 -0700 Subject: [PATCH 2/2] Update specification/rooms/v2.rst Co-Authored-By: turt2live --- specification/rooms/v2.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/rooms/v2.rst b/specification/rooms/v2.rst index 6188966a..1ff2d3fc 100644 --- a/specification/rooms/v2.rst +++ b/specification/rooms/v2.rst @@ -27,7 +27,7 @@ Server implementation components details contained here, and can safely ignore their presence. -Room version 2 uses the base compoennts of `room version 1 `_, changing +Room version 2 uses the base components of `room version 1 `_, changing only the state resolution algorithm.