help: Update Organization basics section to conform to style guide.

This commit is contained in:
Rishi Gupta 2019-04-02 15:39:59 -07:00
parent c65b82832e
commit 3871a44422
6 changed files with 34 additions and 6 deletions

View File

@ -1,4 +1,4 @@
# Change the default language # Set the default language for new users
{!admin-only.md!} {!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 users, and new users can still
[manage their individual language setting](change-your-language). [manage their individual language setting](change-your-language).
### Set the default language for new users
{start_tabs}
{settings_tab|organization-settings} {settings_tab|organization-settings}
2. Under **Default user settings**, change the **Default language**. 2. Under **Default user settings**, change the **Default language**.
{!save-changes.md!} {!save-changes.md!}
!!! tip "" {end_tabs}
You can always send and read messages in any language.
Note that users can always send and read messages in any language, regardless
of their language setting.

View File

@ -2,14 +2,18 @@
{!admin-only.md!} {!admin-only.md!}
{start_tabs}
{settings_tab|organization-profile} {settings_tab|organization-profile}
1. Under **Deactivate organization**, click **Deactivate organization**. 1. Under **Deactivate organization**, click **Deactivate organization**.
1. Confirm by clicking **Deactivate organization**. 1. Confirm by clicking **Deactivate organization**.
!!! tip "" {end_tabs}
This action cannot be undone by anyone in the organization. If you
!!! warn ""
**Note**: This action cannot be undone by anyone in the organization. If you
deactivated your organization by accident, please contact your server deactivated your organization by accident, please contact your server
administrator ({{ support_email }}) as soon as possible, before the administrator ({{ support_email }}) as soon as possible, before the
deactivated organization is permanently deleted. deactivated organization is permanently deleted.

View File

@ -11,6 +11,10 @@ existing Zulip organization.
First, export your data from Gitter. 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 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. 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 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 token by following the instructions in the "**Getting Started**" section of the
[gitter documentation](https://developer.gitter.im/docs/). [gitter documentation](https://developer.gitter.im/docs/).
{end_tabs}
### Import into zulipchat.com ### Import into zulipchat.com
Email support@zulipchat.com with `gitter_data.zip` and your desired Email support@zulipchat.com with `gitter_data.zip` and your desired

View File

@ -17,6 +17,10 @@ into an existing Zulip organization.
First, export your data from Slack. 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 1. [Export your Slack data](https://my.slack.com/services/export). You will
receive a zip file `slack_data.zip`. 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). 2. [Generate a Slack API token](https://api.slack.com/custom-integrations/legacy-tokens).
{end_tabs}
### Import into zulipchat.com ### Import into zulipchat.com
Email support@zulipchat.com with `slack_data.zip`, the Slack API token Email support@zulipchat.com with `slack_data.zip`, the Slack API token

View File

@ -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 You can link to your Zulip from the web with a Zulip
[shields.io](https://github.com/badges/shields) badge: [shields.io](https://github.com/badges/shields) badge:

View File

@ -8,6 +8,12 @@ scale may be applicable now.
Note that most organization settings are visible to all users, though Note that most organization settings are visible to all users, though
generally only organization administrators can interact with them. generally only organization administrators can interact with them.
### Review your organization settings
{start_tabs}
{relative|gear|manage-organization} {relative|gear|manage-organization}
1. Click on each tab on the left. 1. Click on each tab on the left.
{end_tabs}