From cde7931dd9fee28e7c9835286546cc566df813e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Mon, 6 Jan 2025 09:50:11 +0100 Subject: [PATCH 1/6] Clarify that v1.0 of Matrix was a symbolic release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Explain that it was a release prior to the current global versioning system. Signed-off-by: Kévin Commaille --- content/_index.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/content/_index.md b/content/_index.md index e56eb4d05..18228c6aa 100644 --- a/content/_index.md +++ b/content/_index.md @@ -504,8 +504,8 @@ For historical reference, the APIs were versioned as `rX.Y.Z` where `X` roughly represents a breaking change, `Y` a backwards-compatible change, and `Z` a patch or insignificant alteration to the API. -`v1.0` of Matrix was released on June 10th, 2019 with the following API -versions: +`v1.0` of Matrix was a symbolic version released on June 10th, 2019 with the +following minimum API versions: | API/Specification | Version | |-------------------------|---------| @@ -516,6 +516,9 @@ versions: | Push Gateway API | r0.1.0 | | Room Version | v5 | +It is not used in this specification and should not be returned by servers in +the [`GET /_matrix/client/versions`](/client-server-api/#get_matrixclientversions) +endpoint. The first version using the current global versioning system was `v1.1`. ## License From d2094875b5b4c314a814878e5a15d798dc6cf9a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Mon, 6 Jan 2025 10:01:54 +0100 Subject: [PATCH 2/6] Add changelog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- changelogs/internal/newsfragments/2045.clarification | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelogs/internal/newsfragments/2045.clarification diff --git a/changelogs/internal/newsfragments/2045.clarification b/changelogs/internal/newsfragments/2045.clarification new file mode 100644 index 000000000..93aafa3db --- /dev/null +++ b/changelogs/internal/newsfragments/2045.clarification @@ -0,0 +1 @@ +Clarify that v1.0 of Matrix was a symbolic release prior to the current global versionins system. From aa964f9ba1e8291a45f85634811df4e6e68fccea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Mon, 6 Jan 2025 10:05:32 +0100 Subject: [PATCH 3/6] Fix changelog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- changelogs/internal/newsfragments/2045.clarification | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/internal/newsfragments/2045.clarification b/changelogs/internal/newsfragments/2045.clarification index 93aafa3db..7a912fc75 100644 --- a/changelogs/internal/newsfragments/2045.clarification +++ b/changelogs/internal/newsfragments/2045.clarification @@ -1 +1 @@ -Clarify that v1.0 of Matrix was a symbolic release prior to the current global versionins system. +Clarify that v1.0 of Matrix was a symbolic release prior to the current global versioning system. From 88f58386550ad238102da58662454266603dd859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Wed, 22 Jan 2025 13:01:08 +0100 Subject: [PATCH 4/6] Apply review comments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- content/_index.md | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/content/_index.md b/content/_index.md index 18228c6aa..24b316061 100644 --- a/content/_index.md +++ b/content/_index.md @@ -504,21 +504,23 @@ For historical reference, the APIs were versioned as `rX.Y.Z` where `X` roughly represents a breaking change, `Y` a backwards-compatible change, and `Z` a patch or insignificant alteration to the API. -`v1.0` of Matrix was a symbolic version released on June 10th, 2019 with the -following minimum API versions: - -| API/Specification | Version | -|-------------------------|---------| -| Client-Server API | r0.5.0 | -| Server-Server API | r0.1.2 | -| Application Service API | r0.1.1 | -| Identity Service API | r0.1.1 | -| Push Gateway API | r0.1.0 | -| Room Version | v5 | - -It is not used in this specification and should not be returned by servers in -the [`GET /_matrix/client/versions`](/client-server-api/#get_matrixclientversions) -endpoint. The first version using the current global versioning system was `v1.1`. +The current global versioning system was introduced with `v1.1`. +[Matrix 1.0][https://matrix.org/blog/2019/06/11/introducing-matrix-1-0-and-the-matrix-org-foundation/] +did not correspond directly to a specification version; instead, it was based on +the following versions for the individual APIs: + +| API/Specification | Version | +|--------------------------|---------------| +| Client-Server API | r0.5.0 | +| Server-Server API | r0.1.2 | +| Application Service API | r0.1.1 | +| Identity Service API | r0.1.1 | +| Push Gateway API | r0.1.0 | +| Room Versions | 1, 2, 3, 4, 5 | + +`v1.0` should **not** be returned by servers in the +[`GET /_matrix/client/versions`](/client-server-api/#get_matrixclientversions) +response. ## License From 6f86d8de18fbdcc80a170457c38e814a607dd04f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Wed, 22 Jan 2025 13:02:11 +0100 Subject: [PATCH 5/6] Remove "symbolic" from changelog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- changelogs/internal/newsfragments/2045.clarification | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/internal/newsfragments/2045.clarification b/changelogs/internal/newsfragments/2045.clarification index 7a912fc75..bfe42c517 100644 --- a/changelogs/internal/newsfragments/2045.clarification +++ b/changelogs/internal/newsfragments/2045.clarification @@ -1 +1 @@ -Clarify that v1.0 of Matrix was a symbolic release prior to the current global versioning system. +Clarify that v1.0 of Matrix was a release prior to the current global versioning system. From 94fe1dd98986d50b10f76d8b8b45f6488a9a10a7 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Thu, 23 Jan 2025 12:30:53 +0000 Subject: [PATCH 6/6] Update content/_index.md --- content/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/_index.md b/content/_index.md index 24b316061..ec923303b 100644 --- a/content/_index.md +++ b/content/_index.md @@ -505,7 +505,7 @@ roughly represents a breaking change, `Y` a backwards-compatible change, and `Z` a patch or insignificant alteration to the API. The current global versioning system was introduced with `v1.1`. -[Matrix 1.0][https://matrix.org/blog/2019/06/11/introducing-matrix-1-0-and-the-matrix-org-foundation/] +[Matrix 1.0](https://matrix.org/blog/2019/06/11/introducing-matrix-1-0-and-the-matrix-org-foundation/) did not correspond directly to a specification version; instead, it was based on the following versions for the individual APIs: