From b0f03aeb6a02a5c152f769cea4992079609481d1 Mon Sep 17 00:00:00 2001
From: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com>
Date: Fri, 22 Oct 2021 10:00:28 +0200
Subject: [PATCH] Add more information what happens when a user is deactivated
 (#11083)

---
 changelog.d/11083.doc            |  1 +
 docs/admin_api/user_admin_api.md | 10 ++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 changelog.d/11083.doc

diff --git a/changelog.d/11083.doc b/changelog.d/11083.doc
new file mode 100644
index 0000000000..245dd3758d
--- /dev/null
+++ b/changelog.d/11083.doc
@@ -0,0 +1 @@
+Add more information about what happens when a user is deactivated.
\ No newline at end of file
diff --git a/docs/admin_api/user_admin_api.md b/docs/admin_api/user_admin_api.md
index 60dc913915..534f8400ba 100644
--- a/docs/admin_api/user_admin_api.md
+++ b/docs/admin_api/user_admin_api.md
@@ -341,6 +341,7 @@ The following actions are performed when deactivating an user:
 - Remove all 3PIDs from the homeserver
 - Delete all devices and E2EE keys
 - Delete all access tokens
+- Delete all pushers
 - Delete the password hash
 - Removal from all rooms the user is a member of
 - Remove the user from the user directory
@@ -354,6 +355,15 @@ is set to `true`:
 - Remove the user's avatar URL
 - Mark the user as erased
 
+The following actions are **NOT** performed. The list may be incomplete.
+
+- Remove mappings of SSO IDs
+- [Delete media uploaded](#delete-media-uploaded-by-a-user) by user (included avatar images)
+- Delete sent and received messages
+- Delete E2E cross-signing keys
+- Remove the user's creation (registration) timestamp
+- [Remove rate limit overrides](#override-ratelimiting-for-users)
+- Remove from monthly active users
 
 ## Reset password