From 445b0a3a01baeb3c07d5eac8c8acaea4ae966b18 Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Sat, 10 Oct 2020 12:59:42 -0500 Subject: [PATCH] Clarify m.room.redaction, remove duplicate entry Signed-off-by: Aaron Raimist --- event-schemas/schema/m.room.redaction | 2 +- specification/client_server_api.rst | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/event-schemas/schema/m.room.redaction b/event-schemas/schema/m.room.redaction index b3bc418e..f2c10fd5 100644 --- a/event-schemas/schema/m.room.redaction +++ b/event-schemas/schema/m.room.redaction @@ -1,7 +1,7 @@ --- allOf: - $ref: core-event-schema/room_event.yaml -description: 'Events can be redacted by either room or server admins. Redacting an event means that all keys not required by the protocol are stripped off, allowing admins to remove offensive or illegal content that may have been attached to any event. This cannot be undone, allowing server owners to physically delete the offending data. There is also a concept of a moderator hiding a message event, which can be undone, but cannot be applied to state events. The event that has been redacted is specified in the ``redacts`` event level key.' +description: 'Redacting an event means that all keys not required by the protocol are stripped off, allowing messages to be hidden or allowing admins to remove offensive or illegal content. Users may redact their own events, and any user with a power level greater than or equal to the redact power level of the room may redact events in that room. Redactions cannot be undone. The event that has been redacted is specified in the ``redacts`` event level key.' properties: content: properties: diff --git a/specification/client_server_api.rst b/specification/client_server_api.rst index 4847d837..a1f48910 100644 --- a/specification/client_server_api.rst +++ b/specification/client_server_api.rst @@ -1551,8 +1551,6 @@ prefixed with ``m.`` {{m_room_power_levels_event}} -{{m_room_redaction_event}} - Historical events +++++++++++++++++