content/client-server-api/_index.md

@@ -1520,11 +1520,6 @@ client supports it, the client should redirect the user to the
 is complete, the client will need to submit a `/login` request matching
 `m.login.token`.
 
-{{% added-in v="1.17" %}} [OAuth 2.0 aware clients](/client-server-api/#oauth-20-aware-clients)
-MUST only offer the `m.login.sso` flow to the user when `oauth_aware_preferred`
-is set to `true` and MUST add the `action=login` parameter to the SSO redirect
-endpoint.
-
 {{% added-in v="1.7" %}} Already-authenticated clients can additionally generate
 a token for their user ID if supported by the homeserver using
 [`POST /login/get_token`](/client-server-api/#post_matrixclientv1loginget_token).
@@ -1652,7 +1647,7 @@ For a client to be considered fully OAuth 2.0 aware it MUST:
     that the web UI knows that the user wishes to sign out a device and which
     one it is.
 
-Optionally, an OAuth 2.0 aware client MAY:
+Optionally, an OAuth 2.0 aware client COULD:
 
 * Label the SSO button as "Continue" rather than "SSO" when
   `oauth_aware_preferred` is `true`. This is because after redirect the server

data/api/client-server/account_deactivation.yaml

@@ -35,14 +35,6 @@ paths:
         Unlike other endpoints, this endpoint does not take an `id_access_token`
         parameter because the homeserver is expected to sign the request to the
         identity server instead.
-
-        {{% boxes/warning %}}
-        {{% added-in v="1.17" %}} [OAuth 2.0 aware clients](/client-server-api/#oauth-20-aware-clients)
-        MUST NOT use this endpoint when the server supports the [OAuth 2.0 API](/client-server-api/#oauth-20-api).
-        Instead they MUST refer the user to the [account management URL](/client-server-api/#oauth-20-account-management),
-        if available, and MAY use the `action=org.matrix.account_deactivate`
-        parameter.
-        {{% /boxes/warning %}}
       security:
         - {}
         - accessTokenQuery: []

data/api/client-server/device_management.yaml

@@ -142,13 +142,6 @@ paths:
         Since this endpoint uses User-Interactive Authentication, it cannot be used when the access token was obtained
         via the [OAuth 2.0 API](/client-server-api/#oauth-20-api).
         {{% /boxes/warning %}}
-
-        {{% boxes/warning %}}
-        {{% added-in v="1.17" %}} [OAuth 2.0 aware clients](/client-server-api/#oauth-20-aware-clients)
-        MUST NOT use this endpoint when the server supports the [OAuth 2.0 API](/client-server-api/#oauth-20-api).
-        Instead they MUST refer the user to the [account management URL](/client-server-api/#oauth-20-account-management),
-        if available, with the `action=org.matrix.device_delete` and `device_id={deviceId}` parameters.
-        {{% /boxes/warning %}}
       operationId: deleteDevice
       security:
         - accessTokenQuery: []
@@ -206,13 +199,6 @@ paths:
         Since this endpoint uses User-Interactive Authentication, it cannot be used when the access token was obtained
         via the [OAuth 2.0 API](/client-server-api/#oauth-20-api).
         {{% /boxes/warning %}}
-
-        {{% boxes/warning %}}
-        {{% added-in v="1.17" %}} [OAuth 2.0 aware clients](/client-server-api/#oauth-20-aware-clients)
-        MUST NOT use this endpoint when the server supports the [OAuth 2.0 API](/client-server-api/#oauth-20-api).
-        Instead they MUST refer the user to the [account management URL](/client-server-api/#oauth-20-account-management),
-        if available.
-        {{% /boxes/warning %}}
       operationId: deleteDevices
       security:
         - accessTokenQuery: []

data/api/client-server/registration.yaml

@@ -60,14 +60,6 @@ paths:
 
         Any user ID returned by this API must conform to the grammar given in the
         [Matrix specification](/appendices/#user-identifiers).
-
-        {{% boxes/warning %}}
-        {{% added-in v="1.17" %}} [OAuth 2.0 aware clients](/client-server-api/#oauth-20-aware-clients)
-        MUST NOT use this endpoint when the server offers the [`m.login.sso`
-        authentication flow](/client-server-api/#client-login-via-sso) with
-        `oauth_aware_preferred` set to `true`. Instead they MUST add the
-        `action=register` parameter to the SSO redirect endpoint.
-        {{% /boxes/warning %}}
       operationId: register
       parameters:
         - in: query