From cb5df64c178f8636cc1ba6f2f7ec23d1199d9b86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= Date: Wed, 2 Feb 2022 20:59:53 +0100 Subject: [PATCH 1/2] Mark API as not-experimental The API was made non-experimental with [Matrix v1.2](https://matrix.org/blog/2022/02/02/matrix-v-1-2-release) --- docs/usage/administration/admin_api/registration_tokens.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/usage/administration/admin_api/registration_tokens.md b/docs/usage/administration/admin_api/registration_tokens.md index 13d5eb75e933..2c00bafd4327 100644 --- a/docs/usage/administration/admin_api/registration_tokens.md +++ b/docs/usage/administration/admin_api/registration_tokens.md @@ -5,8 +5,7 @@ registration requests, as proposed in [MSC3231](https://github.com/matrix-org/matrix-doc/blob/main/proposals/3231-token-authenticated-registration.md). To use it, you will need to enable the `registration_requires_token` config option, and authenticate by providing an `access_token` for a server admin: -see [Admin API](../../usage/administration/admin_api). -Note that this API is still experimental; not all clients may support it yet. +see [Admin API](../../usage/administration/admin_api). This API is part of the Matrix since v1.2. ## Registration token objects From 9cf966a15f1c18f7793b70ec7d27553bdc4ab403 Mon Sep 17 00:00:00 2001 From: "Olivier Wilkinson (reivilibre)" Date: Fri, 5 Aug 2022 11:21:53 +0100 Subject: [PATCH 2/2] Tweak according to reviews --- changelog.d/11897.doc | 1 + docs/usage/administration/admin_api/registration_tokens.md | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 changelog.d/11897.doc diff --git a/changelog.d/11897.doc b/changelog.d/11897.doc new file mode 100644 index 000000000000..d86b20f53d09 --- /dev/null +++ b/changelog.d/11897.doc @@ -0,0 +1 @@ +Update the 'registration tokens' page to acknowledge that the relevant MSC was merged into version 1.2 of the Matrix specification. Contributed by @moan0s. diff --git a/docs/usage/administration/admin_api/registration_tokens.md b/docs/usage/administration/admin_api/registration_tokens.md index 2c00bafd4327..90cbc21125bf 100644 --- a/docs/usage/administration/admin_api/registration_tokens.md +++ b/docs/usage/administration/admin_api/registration_tokens.md @@ -2,10 +2,11 @@ This API allows you to manage tokens which can be used to authenticate registration requests, as proposed in -[MSC3231](https://github.com/matrix-org/matrix-doc/blob/main/proposals/3231-token-authenticated-registration.md). +[MSC3231](https://github.com/matrix-org/matrix-doc/blob/main/proposals/3231-token-authenticated-registration.md) +and stabilised in version 1.2 of the Matrix specification. To use it, you will need to enable the `registration_requires_token` config option, and authenticate by providing an `access_token` for a server admin: -see [Admin API](../../usage/administration/admin_api). This API is part of the Matrix since v1.2. +see [Admin API](../admin_api). ## Registration token objects