From 0f3cb14aaee74f8397d7bbf3ffe873aa73bc318a Mon Sep 17 00:00:00 2001
From: Lyla Fischer <lylafisch@gmail.com>
Date: Tue, 24 Apr 2018 22:02:06 -0400
Subject: [PATCH] user docs: Use {settings_tab} macro for more organization
 settings.

---
 .../zerver/help/add-a-custom-linkification-filter.md   |  3 +--
 templates/zerver/help/delete-a-stream.md               |  3 +--
 .../zerver/help/set-default-streams-for-new-users.md   |  3 +--
 zerver/lib/bugdown/help_settings_links.py              | 10 ++++++++++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/templates/zerver/help/add-a-custom-linkification-filter.md b/templates/zerver/help/add-a-custom-linkification-filter.md
index c59e94478a..84970bb012 100644
--- a/templates/zerver/help/add-a-custom-linkification-filter.md
+++ b/templates/zerver/help/add-a-custom-linkification-filter.md
@@ -9,8 +9,7 @@ define a filter to automatically linkify #1234 to
 https://github.com/zulip/zulip/pulls/1234, Z1234 to link to that
 Zendesk ticket ID, or anything similar.
 
-1. Go to the [Filter settings](/#organization/filter-settings)
-{!admin.md!}
+{settings_tab|filter-settings}
 
 5. In the green section labeled **Add a new filter**, find the **Regular expression**
 and **URL format string** fields.
diff --git a/templates/zerver/help/delete-a-stream.md b/templates/zerver/help/delete-a-stream.md
index 26fddd9455..ca1e9c20d7 100644
--- a/templates/zerver/help/delete-a-stream.md
+++ b/templates/zerver/help/delete-a-stream.md
@@ -7,8 +7,7 @@ However, Zulip organization administrators must use the Zulip
 **[organization administration interface](/help/change-your-organization-settings)**
 to delete streams.
 
-1. Go to the [Delete streams](/#organization/streams-list-admin)
-{!admin.md!}
+{settings_tab|streams-list-admin}
 
 2. Find the stream you want to delete, and click the **Delete stream** button to
 the right of it.
diff --git a/templates/zerver/help/set-default-streams-for-new-users.md b/templates/zerver/help/set-default-streams-for-new-users.md
index 2444ea236e..225762060a 100644
--- a/templates/zerver/help/set-default-streams-for-new-users.md
+++ b/templates/zerver/help/set-default-streams-for-new-users.md
@@ -5,8 +5,7 @@
 Follow the following steps to set the default streams that new users are automatically
 subscribed to.
 
-1. Go to the [Default streams](/#organization/default-streams-list)
-{!admin.md!}
+{settings_tab|default-streams-list}
 
 2. To add a new stream to **Default streams**, enter the name of the stream in the
 box next to **Stream name**.  Autocompletion suggestions will appear in a
diff --git a/zerver/lib/bugdown/help_settings_links.py b/zerver/lib/bugdown/help_settings_links.py
index 119a517c9b..2d33cb0e9b 100644
--- a/zerver/lib/bugdown/help_settings_links.py
+++ b/zerver/lib/bugdown/help_settings_links.py
@@ -35,6 +35,16 @@ link_mapping = {
     'deactivated-users-admin': ['Manage organization', 'Deactivated users',
                                 '/#organization/deactivated-users-admin'],
     'bot-list-admin': ['Manage organization', 'Bots', '/#organization/bot-list-admin'],
+    'streams-list-admin': ['Manage organization', 'Delete streams',
+                           '/#organization/streams-list-admin'],
+    'default-streams-list': ['Manage organization', 'Default streams',
+                             '/#organization/default-streams-list'],
+    'filter-settings': ['Manage organization', 'Filter settings',
+                        '/#organization/filter-settings'],
+    'profile-field-settings': ['Manage organization', 'Custom profile fields',
+                               '/#organization/profile-field-settings'],
+    'invites-list-admin': ['Manage organization', 'Invitations',
+                           '/#organization/invites-list-admin'],
 }
 
 settings_markdown = """