From 3871a44422c79674401b123c74c91fc9001f77b1 Mon Sep 17 00:00:00 2001 From: Rishi Gupta Date: Tue, 2 Apr 2019 15:39:59 -0700 Subject: [PATCH] help: Update Organization basics section to conform to style guide. --- ...nge-the-default-language-for-your-organization.md | 12 +++++++++--- .../zerver/help/deactivate-your-organization.md | 8 ++++++-- templates/zerver/help/import-from-gitter.md | 6 ++++++ templates/zerver/help/import-from-slack.md | 6 ++++++ templates/zerver/help/join-zulip-chat-badge.md | 2 +- .../zerver/help/review-your-organization-settings.md | 6 ++++++ 6 files changed, 34 insertions(+), 6 deletions(-) diff --git a/templates/zerver/help/change-the-default-language-for-your-organization.md b/templates/zerver/help/change-the-default-language-for-your-organization.md index 1bed363b98..5a702b22e5 100644 --- a/templates/zerver/help/change-the-default-language-for-your-organization.md +++ b/templates/zerver/help/change-the-default-language-for-your-organization.md @@ -1,4 +1,4 @@ -# Change the default language +# Set the default language for new users {!admin-only.md!} @@ -11,11 +11,17 @@ a default language for new users. This setting will not affect existing users, and new users can still [manage their individual language setting](change-your-language). +### Set the default language for new users + +{start_tabs} + {settings_tab|organization-settings} 2. Under **Default user settings**, change the **Default language**. {!save-changes.md!} -!!! tip "" - You can always send and read messages in any language. +{end_tabs} + +Note that users can always send and read messages in any language, regardless +of their language setting. diff --git a/templates/zerver/help/deactivate-your-organization.md b/templates/zerver/help/deactivate-your-organization.md index d8bb081186..7bb4097926 100644 --- a/templates/zerver/help/deactivate-your-organization.md +++ b/templates/zerver/help/deactivate-your-organization.md @@ -2,14 +2,18 @@ {!admin-only.md!} +{start_tabs} + {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 +{end_tabs} + +!!! warn "" + **Note**: 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. diff --git a/templates/zerver/help/import-from-gitter.md b/templates/zerver/help/import-from-gitter.md index c43c6db802..29aaaa12ca 100644 --- a/templates/zerver/help/import-from-gitter.md +++ b/templates/zerver/help/import-from-gitter.md @@ -11,6 +11,10 @@ existing Zulip organization. First, export your data from Gitter. +### Export your Gitter data + +{start_tabs} + 1. [Export your Gitter data](https://github.com/minrk/archive-gitter). You will receive json files of the public rooms that you are a part of. Select the `gitter_data.json` file of the room which you want to import into @@ -21,6 +25,8 @@ First, export your data from Gitter. token by following the instructions in the "**Getting Started**" section of the [gitter documentation](https://developer.gitter.im/docs/). +{end_tabs} + ### Import into zulipchat.com Email support@zulipchat.com with `gitter_data.zip` and your desired diff --git a/templates/zerver/help/import-from-slack.md b/templates/zerver/help/import-from-slack.md index bbdb587f0d..a9009af54b 100644 --- a/templates/zerver/help/import-from-slack.md +++ b/templates/zerver/help/import-from-slack.md @@ -17,6 +17,10 @@ into an existing Zulip organization. First, export your data from Slack. +### Export your Slack data + +{start_tabs} + 1. [Export your Slack data](https://my.slack.com/services/export). You will receive a zip file `slack_data.zip`. @@ -28,6 +32,8 @@ First, export your data from Slack. 2. [Generate a Slack API token](https://api.slack.com/custom-integrations/legacy-tokens). +{end_tabs} + ### Import into zulipchat.com Email support@zulipchat.com with `slack_data.zip`, the Slack API token diff --git a/templates/zerver/help/join-zulip-chat-badge.md b/templates/zerver/help/join-zulip-chat-badge.md index 5b52cd67a8..baf3bcd884 100644 --- a/templates/zerver/help/join-zulip-chat-badge.md +++ b/templates/zerver/help/join-zulip-chat-badge.md @@ -1,4 +1,4 @@ -# "Join Zulip" chat badge +# Link to Zulip from the web You can link to your Zulip from the web with a Zulip [shields.io](https://github.com/badges/shields) badge: diff --git a/templates/zerver/help/review-your-organization-settings.md b/templates/zerver/help/review-your-organization-settings.md index 8b72203d41..b314ef85be 100644 --- a/templates/zerver/help/review-your-organization-settings.md +++ b/templates/zerver/help/review-your-organization-settings.md @@ -8,6 +8,12 @@ scale may be applicable now. Note that most organization settings are visible to all users, though generally only organization administrators can interact with them. +### Review your organization settings + +{start_tabs} + {relative|gear|manage-organization} 1. Click on each tab on the left. + +{end_tabs}