Merge f95dcfb0e7 into a6da9443da

changelogs/client_server/newsfragments/2278.feature

@@ -1 +1 @@
-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).
+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).

content/client-server-api/_index.md

@@ -2396,7 +2396,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, administrators
+{{% added-in v="1.18" %}} To lock or unlock an account, the 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.
@@ -2448,7 +2448,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, administrators
+{{% added-in v="1.18" %}} To suspend or unsuspend an account, the 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.