diff --git a/static/images/help/invite-dropdown.png b/static/images/help/invite-dropdown.png deleted file mode 100644 index 04907d8cfd..0000000000 Binary files a/static/images/help/invite-dropdown.png and /dev/null differ diff --git a/static/images/help/invite-users.png b/static/images/help/invite-users.png deleted file mode 100644 index 83f7d69a26..0000000000 Binary files a/static/images/help/invite-users.png and /dev/null differ diff --git a/templates/zerver/help/include/sidebar_index.md b/templates/zerver/help/include/sidebar_index.md index eb924d94c8..93a17a708b 100644 --- a/templates/zerver/help/include/sidebar_index.md +++ b/templates/zerver/help/include/sidebar_index.md @@ -61,8 +61,8 @@ * [Private messages and group PMs](/help/view-your-pms-and-group-pms) ## People +* [Invite users](/help/invite-users) * [Check whether someone is on-line](/help/check-whether-someone-is-here-or-away) -* [Invite another user](/help/invite-a-friend-to-zulip) * [View someone's profile](/help/view-someones-profile) ## Streams & topics diff --git a/templates/zerver/help/invite-a-friend-to-zulip.md b/templates/zerver/help/invite-a-friend-to-zulip.md deleted file mode 100644 index 974854e1d2..0000000000 --- a/templates/zerver/help/invite-a-friend-to-zulip.md +++ /dev/null @@ -1,58 +0,0 @@ -# Invite a friend to Zulip - -By default, all users in a Zulip organization can invite users to -their Zulip organization. Follow the following steps to invite a friend to Zulip. - -1. Click the cog () in the top right corner of - the right sidebar. - -2. Select **Invite users** from the dropdown menu that appears. - - ![settings](/static/images/help/invite-dropdown.png) - -3. After clicking **Invite users**, a modal window titled **Invite - users to Zulip** will appear. - - ![Invite users to Zulip](/static/images/help/invite-users.png) - -4. In the section labeled **Streams they should join**, select the - options of any streams that you want the users you invite to be - subscribed to by default. Only streams that you're subscribed to - are displayed; the **Check all** option selects all streams, while - the **Uncheck all** option deselects all streams. - -5. After you have finished inputting all fields, click the - **Invite** button in the bottom right corner. A section labeled - **Users invited successfully.** will appear in the modal to confirm - the success of your invitation. - -## Invitation email example - -Users who are invited to Zulip email will receive an email similar to -the example below. - -``` -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 7bit -Subject: [user] invited you to join Zulip -From: [Zulip organization's emails] -To: [your email] -Date: [timestamp] - -Hi there, - -[user] ([user's email]) wants you to join them on Zulip -- the group -communication tool you've always wished you had at work. - -To get started, visit the link below: - <[invite link]> - - -If you are having issues, please contact your Zulip administrator at <[admin's email]>. - - -Cheers, - -The Zulip Team -``` diff --git a/templates/zerver/help/invite-users.md b/templates/zerver/help/invite-users.md new file mode 100644 index 0000000000..a756a98491 --- /dev/null +++ b/templates/zerver/help/invite-users.md @@ -0,0 +1,24 @@ +# Invite users + +By default, users need an invitation to join your Zulip organization, and +any existing user can invite anyone else. + +Organization administrators can also +[modify who can join and invite](/help/manage-who-can-join-and-invite) in a +variety of ways. + +{relative|gear|invite} + +1. Enter a list of **email addresses**, decide whether the new users should + **join as members or admins**, and select the **streams they should join**. + +1. Click **Invite**. + +!!! warn "" + You will only see **Invite users** in the gear menu if you have + permission to invite users. + +## Default streams + +If you're frequently adding users to your organization, you may want to +[set default streams for new users](/help/set-default-streams-for-new-users). diff --git a/zerver/lib/bugdown/help_relative_links.py b/zerver/lib/bugdown/help_relative_links.py index 79728e687e..b98adf584b 100644 --- a/zerver/lib/bugdown/help_relative_links.py +++ b/zerver/lib/bugdown/help_relative_links.py @@ -22,6 +22,7 @@ gear_info = { 'stats': ['Statistics', '/stats'], 'plans': ['Plans and pricing', '/plans'], 'billing': ['Billing', '/billing'], + 'invite': ['Invite users', '/#invite'], } gear_instructions = """