From afb60a6fe932df8f88fb5d9af121b13ac03e524d Mon Sep 17 00:00:00 2001
From: Lyla Fischer <lylafisch@gmail.com>
Date: Wed, 16 May 2018 17:34:15 -0400
Subject: [PATCH] user docs: Document deactivation of account and org.

---
 .../zerver/help/deactivate-your-account.md    | 44 +++++++++----------
 .../help/deactivate-your-organization.md      | 20 +++++++++
 templates/zerver/help/include/sidebar.md      |  1 +
 3 files changed, 42 insertions(+), 23 deletions(-)
 create mode 100644 templates/zerver/help/deactivate-your-organization.md

diff --git a/templates/zerver/help/deactivate-your-account.md b/templates/zerver/help/deactivate-your-account.md
index 43491c0147..49b535f975 100644
--- a/templates/zerver/help/deactivate-your-account.md
+++ b/templates/zerver/help/deactivate-your-account.md
@@ -1,33 +1,31 @@
 # Deactivate your account
 
-We'd be sorry to see you go, but you can follow the following steps to
-deactivate your Zulip account.
-
 {settings_tab|your-account}
 
-2. Click the **Deactivate account** button on the bottom of the
-   **Your account** section.
+1. Under **Deactivate account**, click **Deactivate account**.
 
-4. After clicking the **Deactivate account** button, a modal window titled
-**Deactivate your account** will appear. To confirm the deletion of your
-account, click the **Deactivate now** button.
+1. Confirm by clicking **Deactivate now**.
 
-    !!! warn ""
-        **Note:** Any bots that you maintain will be disabled when you
-        deactivate your account.
+## What happens when you deactivate an account
 
-6. After clicking the **Deactivate now** button, you will be logged
-   out and returned to the Zulip login page.
+* Any bots that you maintain will be disabled.
 
-Please note that you cannot register a Zulip account using the email address of
-a deactivated account.
+* Deactivating your account won't delete messages you've sent or files
+  you've shared. If permitted in your organization, delete content you'd
+  like to remove before deactivating your account.
 
-In addition, if you're the only administrator in the organization, you cannot
-deactivate your account; you need to make another user an administrator first
-before you can deactivate your account.
+* You cannot register a Zulip account using the email
+  address of a deactivated account. If you change your mind about deactivating
+  an account, an organization administrator can
+  [reactivate](/help/deactivate-or-reactivate-a-user#reactivate-a-user)
+  your account at any time.
 
-!!! tip ""
-    If you regret deactivating your account, you can ask a Zulip organization
-    administrator to
-    [reactivate](/help/deactivate-or-reactivate-a-user#reactivate-a-user) your
-    account.
+!!! warn ""
+    If you are the only administrator in the organization, you cannot
+    deactivate your account. You'll need to
+    [add another administrator](make-a-user-an-administrator) first.
+
+## Related articles
+
+You may also be interested in
+[deactivating an organization](/help/deactivate-your-organization).
diff --git a/templates/zerver/help/deactivate-your-organization.md b/templates/zerver/help/deactivate-your-organization.md
new file mode 100644
index 0000000000..d8bb081186
--- /dev/null
+++ b/templates/zerver/help/deactivate-your-organization.md
@@ -0,0 +1,20 @@
+# Deactivate your organization
+
+{!admin-only.md!}
+
+{settings_tab|organization-profile}
+
+1. Under **Deactivate organization**, click **Deactivate organization**.
+
+1. Confirm by clicking **Deactivate organization**.
+
+!!! tip ""
+    This action cannot be undone by anyone in the organization. If you
+    deactivated your organization by accident, please contact your server
+    administrator ({{ support_email }}) as soon as possible, before the
+    deactivated organization is permanently deleted.
+
+!!! warn ""
+    **Note**: You cannot create a new organization using the subdomain of a
+    deactivated one. If you need to reuse a subdomain, ask your server
+    administrator to change the subdomain of the deactivated organization first.
diff --git a/templates/zerver/help/include/sidebar.md b/templates/zerver/help/include/sidebar.md
index 59009387a4..cae07e5bcd 100644
--- a/templates/zerver/help/include/sidebar.md
+++ b/templates/zerver/help/include/sidebar.md
@@ -121,6 +121,7 @@
 * [Allow joining without an invitation](/help/allow-anyone-to-join-without-an-invitation)
 * [Manage who can send invitations](/help/only-allow-admins-to-invite-new-users)
 * [Set the default language for new users](/help/change-the-default-language-for-your-organization)
+* [Deactivate your organization](/help/deactivate-your-organization)
 * [GDPR Compliance](/help/gdpr-compliance)
 
 ## Organization settings