From 68f68bf56d0de127a9dbf684681d928010c35e6b Mon Sep 17 00:00:00 2001 From: Lyla Fischer Date: Tue, 24 Apr 2018 13:44:36 -0400 Subject: [PATCH] help docs: Use {settings_tab} macro for some user settings. --- templates/zerver/help/add-a-bot-or-integration.md | 3 +-- templates/zerver/help/add-an-alert-word.md | 3 +-- templates/zerver/help/manage-your-uploaded-files.md | 6 ++---- templates/zerver/help/mute-a-topic.md | 3 +-- zerver/lib/bugdown/help_settings_links.py | 5 +++++ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/templates/zerver/help/add-a-bot-or-integration.md b/templates/zerver/help/add-a-bot-or-integration.md index 33950470e3..31884e26cf 100644 --- a/templates/zerver/help/add-a-bot-or-integration.md +++ b/templates/zerver/help/add-a-bot-or-integration.md @@ -4,8 +4,7 @@ Bots and integrations are features that are accessible to all members of an orga ## Add a bot -1. Go to the [Your bots](/#settings/your-bots) -{!settings.md!} +{settings_tab|your-bots} 2. On this page, under the **Add a new bot** view, enter the bot type, a name, an email, and optionally an avatar for your bot. diff --git a/templates/zerver/help/add-an-alert-word.md b/templates/zerver/help/add-an-alert-word.md index d4aa747d56..0141f7e710 100644 --- a/templates/zerver/help/add-an-alert-word.md +++ b/templates/zerver/help/add-an-alert-word.md @@ -9,8 +9,7 @@ alert word is included in a message sent to a stream that you are subscribed to. Alert words will be highlighted within messages, and you will be alerted in accordance with your [notification settings](/#settings/notifications). -1. Go to the [Alert words](/#settings/alert-words) -{!settings.md!} +{settings_tab|alert-words} 2. In the section labeled **Add a new alert word**, input the word/phrase you wish to be notified for into the **New alert word** field. diff --git a/templates/zerver/help/manage-your-uploaded-files.md b/templates/zerver/help/manage-your-uploaded-files.md index 7657001e06..734e0275d9 100644 --- a/templates/zerver/help/manage-your-uploaded-files.md +++ b/templates/zerver/help/manage-your-uploaded-files.md @@ -4,8 +4,7 @@ Follow the following steps to view and manage the uploaded files to your organiz ## View your uploaded files -To view your uploaded files, go to the [Uploaded files](/#settings/uploaded-files) -{!settings.md!} +{settings_tab|uploaded-files} All of your uploaded files are displayed in the following format: @@ -42,8 +41,7 @@ You can delete any of your uploaded files from your organization; however, doing so may confuse some of the other users in your organization since they can no longer view the file, so please be careful! -1. Go to the [Uploaded files](/#settings/uploaded-files) -{!settings.md!} +{settings_tab|uploaded-files} 2. Locate the file you want to delete in the **Uploaded files** section; the files are sorted by the time they were uploaded, oldest to newest. diff --git a/templates/zerver/help/mute-a-topic.md b/templates/zerver/help/mute-a-topic.md index 03126f1228..4fa76b44ab 100644 --- a/templates/zerver/help/mute-a-topic.md +++ b/templates/zerver/help/mute-a-topic.md @@ -75,8 +75,7 @@ topic. ## Unmute a topic through the Settings page -1. Go to the [Muted topics](/#settings/muted-topics) -{!settings.md!} +{settings_tab|muted-topics} 2. Locate the topic you want to unmute in the **Muted topics** section; the topics are sorted according to when you first muted a topic in the selected diff --git a/zerver/lib/bugdown/help_settings_links.py b/zerver/lib/bugdown/help_settings_links.py index 18793641c0..bc8a9bb88c 100644 --- a/zerver/lib/bugdown/help_settings_links.py +++ b/zerver/lib/bugdown/help_settings_links.py @@ -14,6 +14,11 @@ link_mapping = { 'your-account': ['Settings', 'Your account', '/#settings/your-account'], 'display-settings': ['Settings', 'Display settings', '/#settings/display-settings'], 'notifications': ['Settings', 'Notifications', '/#settings/notifications'], + 'your-bots': ['Settings', 'Your bots', '/#settings/your-bots'], + 'alert-words': ['Settings', 'Alert words', '/#settings/alert-words'], + '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'], }