data/api/client-server/definitions/request_token_response.yaml

@@ -33,14 +33,13 @@ properties:
       validation token, with identical request and response parameters and error
       codes to the Identity Service API's
       [`POST /_matrix/identity/v2/validate/email/submitToken`](/identity-service-api/#post_matrixidentityv2validateemailsubmittoken)
-      and [`POST /_matrix/identity/v2/validate/msisdn/submitToken`](/identity-service-api/#post_matrixidentityv2validatemsisdnsubmittoken)
+      endpoint (without the requirement for an access token). The homeserver
-      endpoints (without the requirement for an access token). The homeserver
       must send this token to the user (if applicable), who should then be
       prompted to provide it to the client.
 
       If this field is not present, the client can assume that verification
       will happen without the client's involvement provided the homeserver
-      advertises a sufficiently recent version in the [`GET /versions`](/client-server-api/#get_matrixclientversions)
+      advertises this specification version in the [`GET /versions`](/client-server-api/#get_matrixclientversions)
       response (ie: r0.5.0).
     example: "https://example.org/path/to/submitToken"
 required: ['sid']

data/api/identity/v2_email_associations.yaml

@@ -154,13 +154,14 @@ paths:
                     "success": true
                   }
         "400":
+          x-addedInMatrixVersion: "1.18"
           description: |
             An error occurred. Some possible errors are:
 
-            - {{% added-in v="1.18" %}} `M_TOKEN_INCORRECT`: The token that the user entered to validate the session is
+            - `M_TOKEN_INCORRECT`: The token that the user entered to validate the session is
               incorrect.
-            - {{% added-in v="1.18" %}} `M_INVALID_PARAM`: One of the supplied parameters is not valid.
+            - `M_INVALID_PARAM`: One of the supplied parameters is not valid.
-            - {{% added-in v="1.18" %}} `M_SESSION_EXPIRED`: The validation session in question has expired.
+            - `M_SESSION_EXPIRED`: The validation session in question has expired.
           content:
             application/json:
               schema:

data/api/identity/v2_phone_associations.yaml

@@ -156,13 +156,14 @@ paths:
                     "success": true
                   }
         "400":
+          x-addedInMatrixVersion: "1.18"
           description: |
             An error occurred. Some possible errors are:
 
-            - {{% added-in v="1.18" %}} `M_TOKEN_INCORRECT`: The token that the user entered to validate the session is
+            - `M_TOKEN_INCORRECT`: The token that the user entered to validate the session is
               incorrect.
-            - {{% added-in v="1.18" %}} `M_INVALID_PARAM`: One of the supplied parameters is not valid.
+            - `M_INVALID_PARAM`: One of the supplied parameters is not valid.
-            - {{% added-in v="1.18" %}} `M_SESSION_EXPIRED`: The validation session in question has expired.
+            - `M_SESSION_EXPIRED`: The validation session in question has expired.
           content:
             application/json:
               schema: