From b3e2de36e897c741bd3f3bf592b417c46e952b4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= <76261501+zecakeh@users.noreply.github.com> Date: Sat, 14 Feb 2026 12:26:18 +0100 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> --- changelogs/client_server/newsfragments/2278.feature | 2 +- content/client-server-api/_index.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changelogs/client_server/newsfragments/2278.feature b/changelogs/client_server/newsfragments/2278.feature index e2d0e630..3da8ec77 100644 --- a/changelogs/client_server/newsfragments/2278.feature +++ b/changelogs/client_server/newsfragments/2278.feature @@ -1 +1 @@ -Add endpoints to lock and suspend server-local users for administrations and add the `m.account_management` capability, as per [MSC4323](https://github.com/matrix-org/matrix-spec-proposals/pull/4323). +Add administrator endpoints to lock and suspend server-local users and add the `m.account_management` capability, as per [MSC4323](https://github.com/matrix-org/matrix-spec-proposals/pull/4323). diff --git a/content/client-server-api/_index.md b/content/client-server-api/_index.md index d7a6399b..b9629d15 100644 --- a/content/client-server-api/_index.md +++ b/content/client-server-api/_index.md @@ -2282,7 +2282,7 @@ using their accounts, for instance, due to safety or security concerns. In contrast to account deactivation, locking is a non-destructive action that can be reversed. -{{% added-in v="1.18" %}} To lock or unlock an account, the administrators +{{% added-in v="1.18" %}} To lock or unlock an account, administrators SHOULD use the [`PUT /admin/lock/{userId}`](#put_matrixclientv1adminlockuserid) endpoint. They MAY also use [`GET /admin/lock/{userId}`](#get_matrixclientv1adminlockuserid) to check whether a user's account is locked. @@ -2334,7 +2334,7 @@ from that account. The effect is similar to [locking](#account-locking), though without risk of the client losing state from a logout. Suspensions are reversible, like locks and unlike deactivations. -{{% added-in v="1.18" %}} To suspend or unsuspend an account, the administrators +{{% added-in v="1.18" %}} To suspend or unsuspend an account, administrators SHOULD use the [`PUT /admin/suspend/{userId}`](#put_matrixclientv1adminsuspenduserid) endpoint. They MAY also use [`GET /admin/suspend/{userId}`](#get_matrixclientv1adminsuspenduserid) to check whether a user's account is suspended.