diff --git a/templates/zerver/help/allow-anyone-to-join-without-an-invitation.md b/templates/zerver/help/allow-anyone-to-join-without-an-invitation.md index fef4182b22..7b2ccb3d4a 100644 --- a/templates/zerver/help/allow-anyone-to-join-without-an-invitation.md +++ b/templates/zerver/help/allow-anyone-to-join-without-an-invitation.md @@ -11,8 +11,7 @@ members to those with email invitations. ## Limiting new membership to users invited by organization members -1. Go to the [Organization permissions](/#organization/organization-permissions) -{!admin.md!} +{settings_tab|organization-permissions} 4. Locate the **Users need an invitation to join** checkbox under the **Joining the organization** section. diff --git a/templates/zerver/help/allow-image-link-previews.md b/templates/zerver/help/allow-image-link-previews.md index 7f05481f27..d18a83719a 100644 --- a/templates/zerver/help/allow-image-link-previews.md +++ b/templates/zerver/help/allow-image-link-previews.md @@ -6,8 +6,7 @@ By default, when a user uploads or links to an image or links to a website, a preview of the content will be shown. You can choose to disable previews of images and links separately. -1. Go to the [Organization settings](/#organization/organization-settings) -{!admin.md!} +{settings_tab|organization-settings} 2. Select the **Show previews of uploaded and linked images** or the **Show previews of linked websites** checkbox under the **Message feed** 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 60b29349ed..5c7305a4d6 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 @@ -4,8 +4,7 @@ Follow the following steps to change the default language of your organization. -1. Go to the [Organization settings](/#organization/organization-settings) -{!admin.md!} +{settings_tab|organization-settings} 2. Find and click on the **Default language** option under the **Language & notifications** section. diff --git a/templates/zerver/help/create-your-organization-profile.md b/templates/zerver/help/create-your-organization-profile.md index b8359ece5f..b57768d914 100644 --- a/templates/zerver/help/create-your-organization-profile.md +++ b/templates/zerver/help/create-your-organization-profile.md @@ -6,8 +6,7 @@ There are several aspects to your organization's profile that can be configured to customize how your organization appears to users and people searching for your organization. -1. Go to the [Organization profile](/#organization/organization-profile) -{!admin.md!} +{settings_tab|organization-profile} ## Change your organization's name diff --git a/templates/zerver/help/only-allow-admins-to-add-emoji.md b/templates/zerver/help/only-allow-admins-to-add-emoji.md index 0b3c2ec56c..003ebbddd8 100644 --- a/templates/zerver/help/only-allow-admins-to-add-emoji.md +++ b/templates/zerver/help/only-allow-admins-to-add-emoji.md @@ -6,8 +6,7 @@ By default, any user in your Zulip organization can add custom emoji to the organization. You can change your organization's settings to only allow administrators to add new emoji. -1. Go to the [Organization permissions](/#organization/organization-permissions) -{!admin.md!} +{settings_tab|organization-permissions} 2. Select the **Prevent users from adding custom emoji** checkbox under the **Streams & custom emoji** section. diff --git a/templates/zerver/help/only-allow-admins-to-create-new-streams-feature.md b/templates/zerver/help/only-allow-admins-to-create-new-streams-feature.md index 9cfe73aef0..e04a18058a 100644 --- a/templates/zerver/help/only-allow-admins-to-create-new-streams-feature.md +++ b/templates/zerver/help/only-allow-admins-to-create-new-streams-feature.md @@ -5,8 +5,7 @@ By default, any user can create new streams. You can enable a setting that only allows administrators to create new streams in the organization. -1. Go to the [Organization permissions](/#organization/organization-permissions) -{!admin.md!} +{settings_tab|organization-permissions} 2. Select the **Prevent users from creating streams** checkbox under the **Streams & custom emoji** section. diff --git a/templates/zerver/help/only-allow-admins-to-invite-new-users.md b/templates/zerver/help/only-allow-admins-to-invite-new-users.md index 8b51f46672..aa4958ed42 100644 --- a/templates/zerver/help/only-allow-admins-to-invite-new-users.md +++ b/templates/zerver/help/only-allow-admins-to-invite-new-users.md @@ -6,8 +6,7 @@ By default, any user in your Zulip organization can invite new users. You can change your organization's settings to only allow administrators to invite new users. -1. Go to the [Organization permissions](/#organization/organization-permissions) -{!admin.md!} +{settings_tab|organization-permissions} 2. Select the **Users need an invitation to join** and **Only admins can invite new users** checkboxes under the **Joining the organization** section. diff --git a/templates/zerver/help/require-users-to-include-topics-in-stream-messages.md b/templates/zerver/help/require-users-to-include-topics-in-stream-messages.md index fee700d62a..657a67bab4 100644 --- a/templates/zerver/help/require-users-to-include-topics-in-stream-messages.md +++ b/templates/zerver/help/require-users-to-include-topics-in-stream-messages.md @@ -11,8 +11,7 @@ Some organizations prefer to require that every message to a stream includes a topic. Organization administrators can choose to enforce the use of topics in new messages to streams: -1. Go to the [Organization settings](/#organization/organization-settings) -{!admin.md!} +{settings_tab|organization-settings} 2. Select the **Require topics in messages to streams** checkbox under the **Message feed** section. diff --git a/templates/zerver/help/restrict-name-and-email-changes.md b/templates/zerver/help/restrict-name-and-email-changes.md index 1515f6e192..8bf08af911 100644 --- a/templates/zerver/help/restrict-name-and-email-changes.md +++ b/templates/zerver/help/restrict-name-and-email-changes.md @@ -2,9 +2,7 @@ {!admin-only.md!} - -1. Go to the [Organization permissions](/#organization/organization-permissions) -{!admin.md!} +{settings_tab|organization-permissions} # Prevent users from changing their email address diff --git a/templates/zerver/help/restrict-user-email-addresses-to-certain-domains.md b/templates/zerver/help/restrict-user-email-addresses-to-certain-domains.md index bc24cf2b7d..d26ca91fed 100644 --- a/templates/zerver/help/restrict-user-email-addresses-to-certain-domains.md +++ b/templates/zerver/help/restrict-user-email-addresses-to-certain-domains.md @@ -7,8 +7,7 @@ who are not in their organization. The administrator can accomplish this by restricting users to have email addresses only from the organization's domains. -1. Go to the [Organization permissions](/#organization/organization-permissions) -{!admin.md!} +{settings_tab|organization-permissions} 2. Restricting user email addresses to certain domains can be enabled or disabled with the **Users restricted to (allowed domains)** checkbox in the diff --git a/zerver/lib/bugdown/help_settings_links.py b/zerver/lib/bugdown/help_settings_links.py index bc8a9bb88c..cc5602fdd9 100644 --- a/zerver/lib/bugdown/help_settings_links.py +++ b/zerver/lib/bugdown/help_settings_links.py @@ -19,7 +19,14 @@ link_mapping = { 'uploaded-files': ['Settings', 'Uploaded files', '/#settings/uploaded-files'], 'muted-topics': ['Settings', 'Muted topics', '/#settings/muted-topics'], - 'emoji-settings': ['Manage organization', 'Custom emoji', '/#organization/emoji-settings'], + 'organization-profile': ['Manage organization', 'Organization profile', + '/#organization/organization-profile'], + 'organization-settings': ['Manage organization', 'Organization settings', + '/#organization/organization-settings'], + 'organization-permissions': ['Manage organization', 'Organization permissions', + '/#organization/organization-permissions'], + 'emoji-settings': ['Manage organization', 'Custom emoji', + '/#organization/emoji-settings'], } settings_markdown = """