Merge 3e6c1e35d9 into 68994d7fcd

Signed-off-by: Johanna Stuber <johannas@element.io>

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

@@ -1742,11 +1742,11 @@ The content of an event encrypted using Olm has the following format:
 Note that when the event is received from the server, it will have a `type`
 (with a value of `m.room.encrypted`) and `sender` property alongside the
 `content` property. In `content`, `ciphertext` is a mapping from a device
-Curve25519 key to an object with a `type` and a `body`. Here, `type` is an
+Curve25519 key to an object with a `type` and a `body`. Here, `body` is a
-integer indicating the type of the message body:
+Base64-encoded [Olm message](/olm-megolm/olm/#the-olm-message-format), and
-0 for the initial [pre-key message](/olm-megolm/olm/#pre-key-messages),
+`type` is an integer indicating the type of the message:
-1 for [normal messages](/olm-megolm/olm/#normal-messages);
+0 for the initial [pre-key messages](/olm-megolm/olm/#pre-key-messages),
-`body` is a Base64-encoded [Olm message body](/olm-megolm/olm/#the-olm-message-format).
+1 for [normal messages](/olm-megolm/olm/#normal-messages).
 
 Olm sessions will generate messages with a type of 0 until they receive
 a message. Once a session has decrypted a message it will produce
@@ -1912,7 +1912,7 @@ The content of an event encrypted using Megolm has the following format:
 Note that when the event is received from the server, it will have additional
 properties alongside the `content` property, including a `type` (with a value
 of `m.room.encrypted`) and a `sender` property. In `content`, `ciphertext`
-is a Base64-encoded [Megolm message body](/olm-megolm/megolm/#message-format),
+is a Base64-encoded [Megolm message](/olm-megolm/megolm/#message-format),
 whose plaintext body is of the form:
 
 ```json