fixup! e2ee/device verification: move general error handling under framework

Signed-off-by: Sumner Evans <sumner.evans@automattic.com>

content/client-server-api/modules/end_to_end_encryption.md

@@ -603,8 +603,8 @@ At any point the interactive verification can go wrong. The following describes
 what to do when an error happens:
 
 -   Alice or Bob can cancel the verification at any time. An
-  [`m.key.verification.cancel`](#mkeyverificationcancel) message must be sent to
-  signify the cancellation.
+    [`m.key.verification.cancel`](#mkeyverificationcancel) message must be sent
+    to signify the cancellation.
 -   The verification can time out. Clients should time out a verification that
     does not complete within 10 minutes. Additionally, clients should expire a
     `transaction_id` which goes unused for 10 minutes after having last
@@ -615,13 +615,13 @@ what to do when an error happens:
 -   When the same device attempts to initiate multiple verification attempts,
     the recipient should cancel all attempts with that device.
 -   When a device receives an unknown `transaction_id`, it should send an
-  appropriate [`m.key.verification.cancel`](#mkeyverificationcancel) message to
-  the other device indicating as such. This does not apply for inbound
+    appropriate [`m.key.verification.cancel`](#mkeyverificationcancel) message
+    to the other device indicating as such. This does not apply for inbound
     [`m.key.verification.request`](#mkeyverificationrequest),
     [`m.key.verification.start`](#mkeyverificationstart), or
     [`m.key.verification.cancel`](#mkeyverificationcancel) messages.
-- If the device receives a message out of sequence or that it was not expecting,
-  it should notify the other device with an appropriate
+-   If the device receives a message out of sequence or that it was not
+    expecting, it should notify the other device with an appropriate
     [`m.key.verification.cancel`](#mkeyverificationcancel) message.
 
 ##### Short Authentication String (SAS) verification
@@ -749,8 +749,9 @@ devices:
 
 ###### Error handling during SAS verification
 
-At any point the interactive verification can go wrong. The following
-describes what to do when an error happens:
+At any point the interactive verification can go wrong. In addition to the
+[Error handling during key verification](#error-handling-during-key-verification) The following describes
+what to do when an error happens:
 
 -   If the two devices do not share a common key share, hash, HMAC, or
     SAS method then the device should notify the other device with an