From b00c030791524e41855360ac7328deda3916f43a Mon Sep 17 00:00:00 2001 From: David Rosa Date: Tue, 23 Aug 2022 01:01:04 -0400 Subject: [PATCH] help: Document "Import your settings" feature. Adds a new page titled "Import your settings" in the "Account basics" section to document how to import user settings from an existing Zulip account to a new Zulip account, and which settings will be imported. Adds a question mark (?) icon linking to this help page from the registration form when the import settings option is available. Adds cross-links on related articles. Fixes: #20918. --- templates/zerver/help/import-your-settings.md | 39 +++++++++++++++++++ .../zerver/help/include/sidebar_index.md | 1 + templates/zerver/help/invite-new-users.md | 1 + .../zerver/help/join-a-zulip-organization.md | 7 ++++ templates/zerver/help/review-your-settings.md | 4 ++ .../help/switching-between-organizations.md | 1 + templates/zerver/register.html | 4 +- 7 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 templates/zerver/help/import-your-settings.md diff --git a/templates/zerver/help/import-your-settings.md b/templates/zerver/help/import-your-settings.md new file mode 100644 index 0000000000..b7fc61dffa --- /dev/null +++ b/templates/zerver/help/import-your-settings.md @@ -0,0 +1,39 @@ +# Import your settings + +When you create a Zulip account using an email address already associated with +an account in another Zulip organization, on Zulip Cloud or the same self-hosted +Zulip installation, you can import your user settings from an existing account. +It's a convenient way to preserve the user settings that you've already customized. + +!!! tip "" + + Settings that may not apply to all organizations, such as custom profile + fields, will not be imported. + +The import will include your: + +- [Name and avatar](/#settings/profile) +- [Privacy settings](/#settings/account-and-privacy) +- [Display settings](/#settings/display-settings) +- [Notification settings](/#settings/notifications) +- Tutorial completion status. + +### Import your settings + +{start_tabs} + +1. Follow the instructions for [joining a Zulip organization](/help/join-a-zulip-organization). + +1. From the dropdown list under **Import settings from an existing Zulip account**, + select the account from which you would like to import your settings. + +1. Complete the registration form, and click **Sign up**. + +1. _(recommended)_ [Review your settings](/help/review-your-settings). + +{end_tabs} + +## Related articles + +* [Joining a Zulip organization](/help/join-a-zulip-organization) +* [Review your settings](/help/review-your-settings) diff --git a/templates/zerver/help/include/sidebar_index.md b/templates/zerver/help/include/sidebar_index.md index aee3944dd8..daded2530f 100755 --- a/templates/zerver/help/include/sidebar_index.md +++ b/templates/zerver/help/include/sidebar_index.md @@ -40,6 +40,7 @@ * [Logging in](/help/logging-in) * [Logging out](/help/logging-out) * [Switching between organizations](/help/switching-between-organizations) +* [Import your settings](/help/import-your-settings) * [Deactivate your account](/help/deactivate-your-account) ## Display settings diff --git a/templates/zerver/help/invite-new-users.md b/templates/zerver/help/invite-new-users.md index 6b6cfbc36c..d918827b15 100644 --- a/templates/zerver/help/invite-new-users.md +++ b/templates/zerver/help/invite-new-users.md @@ -97,5 +97,6 @@ for invitations for the organization owners role. * [Configure default new user settings](/help/configure-default-new-user-settings) * [Configure organization language for automated messages and invitation emails][org-lang] * [Roles and permissions](/help/roles-and-permissions) +* [Joining a Zulip organization](/help/join-a-zulip-organization) [org-lang]: /help/configure-organization-language diff --git a/templates/zerver/help/join-a-zulip-organization.md b/templates/zerver/help/join-a-zulip-organization.md index 169fbbc660..f36058ec14 100644 --- a/templates/zerver/help/join-a-zulip-organization.md +++ b/templates/zerver/help/join-a-zulip-organization.md @@ -53,3 +53,10 @@ link via another method. these instructions may not apply. Try going to your company's Zulip URL to see if there are instructions there; otherwise contact your manager or IT department for company-specific instructions. + + +## Related articles + +* [Invite new users](/help/invite-new-users) +* [Switching between organizations](/help/switching-between-organizations) +* [Import your settings](/help/import-your-settings) diff --git a/templates/zerver/help/review-your-settings.md b/templates/zerver/help/review-your-settings.md index 560aa8014f..cbda540282 100644 --- a/templates/zerver/help/review-your-settings.md +++ b/templates/zerver/help/review-your-settings.md @@ -23,3 +23,7 @@ you use Zulip. 1. Click on the **Display settings** tab on the left. {end_tabs} + +## Related articles + +* [Import your settings](/help/import-your-settings) diff --git a/templates/zerver/help/switching-between-organizations.md b/templates/zerver/help/switching-between-organizations.md index 6d600baa7b..15300b5f5f 100644 --- a/templates/zerver/help/switching-between-organizations.md +++ b/templates/zerver/help/switching-between-organizations.md @@ -33,3 +33,4 @@ an organization from the **Window** menu in the top menu bar. * [Logging out](logging-out) * [Deactivate your account](deactivate-your-account) * [Create your organization profile](create-your-organization-profile) +* [Joining a Zulip organization](/help/join-a-zulip-organization) diff --git a/templates/zerver/register.html b/templates/zerver/register.html index 76f281f78f..0ae0337c75 100644 --- a/templates/zerver/register.html +++ b/templates/zerver/register.html @@ -119,7 +119,9 @@ Form is validated both client-side using jquery-validation (see signup.js) and s {% if accounts %}
- +