Merge branch 'e2e_verification_in_dms' of github.com:uhoreg/matrix-doc into e2e_verification_in_dms
This commit is contained in:
commit
788e98711e
1 changed files with 2 additions and 2 deletions
|
@ -97,7 +97,7 @@ case this proposal should follow suit.
|
||||||
methods may use the device IDs as part of the verification process.
|
methods may use the device IDs as part of the verification process.
|
||||||
|
|
||||||
Clients should ignore `m.key.verification.start` events that correspond to
|
Clients should ignore `m.key.verification.start` events that correspond to
|
||||||
verification requests that it did not send.
|
verification requests that they did not send.
|
||||||
|
|
||||||
#### Rejecting a key verification
|
#### Rejecting a key verification
|
||||||
|
|
||||||
|
@ -144,7 +144,7 @@ Clients should ignore events with an `m.relates_to` that have a `rel_type` of
|
||||||
`m.reference` that refer to a verification where it is not the requester
|
`m.reference` that refer to a verification where it is not the requester
|
||||||
nor the accepter.
|
nor the accepter.
|
||||||
|
|
||||||
### SAS verification
|
### SAS verification
|
||||||
|
|
||||||
The messages used in SAS verification are the same as those currently defined,
|
The messages used in SAS verification are the same as those currently defined,
|
||||||
except that instead of the `transaction_id` property, an `m.relates_to`
|
except that instead of the `transaction_id` property, an `m.relates_to`
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue