From b0b6a89ded3397a45ccd045e77b404a5b46ea1c3 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Wed, 9 Aug 2023 14:48:38 -0400
Subject: [PATCH] Clean-up examples and language.

---
 data/event-schemas/examples/m.room.create.yaml    | 3 +--
 data/event-schemas/examples/m.room.redaction.yaml | 2 +-
 data/event-schemas/schema/m.room.create.yaml      | 2 --
 data/event-schemas/schema/m.room.redaction.yaml   | 6 ++----
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/data/event-schemas/examples/m.room.create.yaml b/data/event-schemas/examples/m.room.create.yaml
index e33dbc3b..390ea78d 100644
--- a/data/event-schemas/examples/m.room.create.yaml
+++ b/data/event-schemas/examples/m.room.create.yaml
@@ -3,8 +3,7 @@
   "type": "m.room.create",
   "state_key": "",
   "content": {
-    "creator": "@example:example.org",
-    "room_version": "1",
+    "room_version": "11",
     "m.federate": true,
     "predecessor": {
       "event_id": "$something:example.org",
diff --git a/data/event-schemas/examples/m.room.redaction.yaml b/data/event-schemas/examples/m.room.redaction.yaml
index 42bc8411..457b0a37 100644
--- a/data/event-schemas/examples/m.room.redaction.yaml
+++ b/data/event-schemas/examples/m.room.redaction.yaml
@@ -1,8 +1,8 @@
 {
   "$ref": "core/room_event.json",
   "type": "m.room.redaction",
-  "redacts": "$fukweghifu23:localhost",
   "content": {
+    "redacts": "$fukweghifu23:localhost",
     "reason": "Spamming"
   }
 }
diff --git a/data/event-schemas/schema/m.room.create.yaml b/data/event-schemas/schema/m.room.create.yaml
index be0eb32f..1ca37865 100644
--- a/data/event-schemas/schema/m.room.create.yaml
+++ b/data/event-schemas/schema/m.room.create.yaml
@@ -34,8 +34,6 @@ properties:
             type: string
             description: The event ID of the last known event in the old room.
         required: [room_id, event_id]
-    required:
-      - creator
     type: object
   state_key:
     description: A zero-length string.
diff --git a/data/event-schemas/schema/m.room.redaction.yaml b/data/event-schemas/schema/m.room.redaction.yaml
index d68d9a3e..8a7edeba 100644
--- a/data/event-schemas/schema/m.room.redaction.yaml
+++ b/data/event-schemas/schema/m.room.redaction.yaml
@@ -6,20 +6,18 @@ properties:
   content:
     properties:
       redacts:
-        description: The event ID that was redacted. Present starting in room version 11.
+        description: The event ID that was redacted. Required for, and present starting in, room version 11.
         type: string
       reason:
         description: 'The reason for the redaction, if any.'
         type: string
     type: object
   redacts:
-    description: Only present in room versions 1 - 10. The event ID that was redacted.
+    description: Required for, and only present in, room versions 1 - 10. The event ID that was redacted.
     type: string
   type:
     enum:
       - m.room.redaction
     type: string
-required:
-  - redacts
 title: Redaction
 type: object