From 39c897a2b0d9362ba31e0f93208463ec2e3058ef Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulip.com>
Date: Tue, 14 Sep 2021 16:42:35 -0700
Subject: [PATCH] help: Rename about-streams-and-topics to streams-and-topics.

This better matches the title of the page and more generally our
conventions around naming /help/ articles.  We include a redirect
because this is referenced from Welcome Bot messages, and we
definitely don't want those links to break.
---
 templates/zerver/features.html                              | 2 +-
 templates/zerver/for-companies.html                         | 2 +-
 templates/zerver/for-education.html                         | 2 +-
 templates/zerver/for-events.html                            | 2 +-
 templates/zerver/for-research.html                          | 2 +-
 templates/zerver/help/browse-and-subscribe-to-streams.md    | 2 +-
 templates/zerver/help/getting-started-with-zulip.md         | 2 +-
 .../help/getting-your-organization-started-with-zulip.md    | 2 +-
 templates/zerver/help/include/sidebar_index.md              | 4 ++--
 templates/zerver/help/private-messages.md                   | 2 +-
 templates/zerver/help/reading-strategies.md                 | 2 +-
 templates/zerver/help/resolve-a-topic.md                    | 2 +-
 .../{about-streams-and-topics.md => streams-and-topics.md}  | 0
 zerver/lib/onboarding.py                                    | 2 +-
 zerver/lib/test_helpers.py                                  | 1 +
 zproject/urls.py                                            | 6 ++++++
 16 files changed, 21 insertions(+), 14 deletions(-)
 rename templates/zerver/help/{about-streams-and-topics.md => streams-and-topics.md} (100%)

diff --git a/templates/zerver/features.html b/templates/zerver/features.html
index 32da93d29e..bb934d0e56 100644
--- a/templates/zerver/features.html
+++ b/templates/zerver/features.html
@@ -211,7 +211,7 @@
             <p>Zulip’s drafts make it easy to write longer messages
             without worrying about losing your work.</p>
         </a>
-        <a class="feature-block" href="/help/about-streams-and-topics" target="_blank" rel="noopener noreferrer">
+        <a class="feature-block" href="/help/streams-and-topics" target="_blank" rel="noopener noreferrer">
             <h3>CONVERSATIONS THREADED BY TOPIC</h3>
             <p>Participate in several conversations with the same
             group at once, without getting lost or overwhelmed.</p>
diff --git a/templates/zerver/for-companies.html b/templates/zerver/for-companies.html
index 7c55bf3e50..a6a104a46c 100644
--- a/templates/zerver/for-companies.html
+++ b/templates/zerver/for-companies.html
@@ -78,7 +78,7 @@
                 <ul>
                     <li>
                         <div class="list-content">
-                            Like email threads, <a href="/help/about-streams-and-topics">Zulip topics</a> create a separate space for each discussion, so different conversations will never get in each other’s way.
+                            Like email threads, <a href="/help/streams-and-topics">Zulip topics</a> create a separate space for each discussion, so different conversations will never get in each other’s way.
                         </div>
                     </li>
                     <li>
diff --git a/templates/zerver/for-education.html b/templates/zerver/for-education.html
index cb5992f98a..868e6944b8 100644
--- a/templates/zerver/for-education.html
+++ b/templates/zerver/for-education.html
@@ -57,7 +57,7 @@
                 <ul>
                     <li>
                         <div class="list-content">
-                            <a href="/help/about-streams-and-topics">Zulip topics</a> create a separate space for each discussion.
+                            <a href="/help/streams-and-topics">Zulip topics</a> create a separate space for each discussion.
                         </div>
                     </li>
                     <li><div class="list-content"> Questions and answers are easy to find, so each question is only asked once.</div></li>
diff --git a/templates/zerver/for-events.html b/templates/zerver/for-events.html
index 4ce4b713fb..b5e26c1345 100644
--- a/templates/zerver/for-events.html
+++ b/templates/zerver/for-events.html
@@ -56,7 +56,7 @@
                 <ul>
                     <li>
                         <div class="list-content">
-                            <a href="/help/about-streams-and-topics">Zulip
+                            <a href="/help/streams-and-topics">Zulip
                             topics</a> create a separate space for
                             each discussion or question.
                         </div>
diff --git a/templates/zerver/for-research.html b/templates/zerver/for-research.html
index 0b490dd777..bb3d1b51f2 100644
--- a/templates/zerver/for-research.html
+++ b/templates/zerver/for-research.html
@@ -56,7 +56,7 @@
                 <ul>
                     <li>
                         <div class="list-content">
-                            <a href="/help/about-streams-and-topics">Zulip
+                            <a href="/help/streams-and-topics">Zulip
                             topics</a> create a separate space for each
                             discussion.
                         </div>
diff --git a/templates/zerver/help/browse-and-subscribe-to-streams.md b/templates/zerver/help/browse-and-subscribe-to-streams.md
index 5a9b019638..bac3071045 100644
--- a/templates/zerver/help/browse-and-subscribe-to-streams.md
+++ b/templates/zerver/help/browse-and-subscribe-to-streams.md
@@ -13,4 +13,4 @@
 
 ## Related articles
 
-* [About streams and topics](/help/about-streams-and-topics)
+* [Streams and topics](/help/streams-and-topics)
diff --git a/templates/zerver/help/getting-started-with-zulip.md b/templates/zerver/help/getting-started-with-zulip.md
index 472aaaa797..2aaa21011e 100644
--- a/templates/zerver/help/getting-started-with-zulip.md
+++ b/templates/zerver/help/getting-started-with-zulip.md
@@ -6,7 +6,7 @@ service again.
 
 ## Understand
 
-Read our [guide to streams and topics](/help/about-streams-and-topics) to familiarize
+Read our [guide to streams and topics](/help/streams-and-topics) to familiarize
 yourself with Zulip's conversation model.
 
 If this is your first time using Zulip, we recommend starting with the web
diff --git a/templates/zerver/help/getting-your-organization-started-with-zulip.md b/templates/zerver/help/getting-your-organization-started-with-zulip.md
index 3e9e115242..9347cf3a82 100644
--- a/templates/zerver/help/getting-your-organization-started-with-zulip.md
+++ b/templates/zerver/help/getting-your-organization-started-with-zulip.md
@@ -52,7 +52,7 @@ Zulip’s topics are life-changing, but it can take a bit of time for everyone
 to learn how to use them effectively. It helps a lot if there are at least a
 few people who understand the conversation model at the beginning.
 
-* Read our [guide to streams and topics](/help/about-streams-and-topics),
+* Read our [guide to streams and topics](/help/streams-and-topics),
   and send it out to a few people who you think would be good stewards of
   the organization.
 
diff --git a/templates/zerver/help/include/sidebar_index.md b/templates/zerver/help/include/sidebar_index.md
index 23b7e0d1f0..491e236f24 100644
--- a/templates/zerver/help/include/sidebar_index.md
+++ b/templates/zerver/help/include/sidebar_index.md
@@ -1,7 +1,7 @@
 ## Guides
 * [Getting started with Zulip](/help/getting-started-with-zulip)
 * [Setting up your organization](/help/getting-your-organization-started-with-zulip)
-* [Streams and topics](/help/about-streams-and-topics)
+* [Streams and topics](/help/streams-and-topics)
 * [Moderating open organizations](/help/moderating-open-organizations)
 * [Using Zulip via email](/help/using-zulip-via-email)
 
@@ -61,7 +61,7 @@
 * [Private messages](/help/private-messages)
 
 ## Streams & topics
-* [About streams and topics](/help/about-streams-and-topics)
+* [Streams and topics](/help/streams-and-topics)
 * [Browse and subscribe to streams](/help/browse-and-subscribe-to-streams)
 * [Create a stream](/help/create-a-stream)
 * [Add or remove users from a stream](/help/add-or-remove-users-from-a-stream)
diff --git a/templates/zerver/help/private-messages.md b/templates/zerver/help/private-messages.md
index c4b973b2b4..dd0b0cb533 100644
--- a/templates/zerver/help/private-messages.md
+++ b/templates/zerver/help/private-messages.md
@@ -11,7 +11,7 @@ conversations instead.
 
 Note that group PMs are not the same as [user groups](/help/user-groups) or private
 streams. PMs and group PMs do not have
-[topics](/help/about-streams-and-topics), and do not appear in your list of
+[topics](/help/streams-and-topics), and do not appear in your list of
 streams.
 
 ### Send a PM or group PM
diff --git a/templates/zerver/help/reading-strategies.md b/templates/zerver/help/reading-strategies.md
index 35db1c6622..6d5eecc237 100644
--- a/templates/zerver/help/reading-strategies.md
+++ b/templates/zerver/help/reading-strategies.md
@@ -1,7 +1,7 @@
 # Reading strategies
 
 Zulip works a little bit differently than other chat platforms. Read
-[streams and topics](/help/about-streams-and-topics) if you're not yet
+[streams and topics](/help/streams-and-topics) if you're not yet
 familiar with Zulip's topics, and [why Zulip](/why-zulip) if you're
 curious why we built Zulip the way we did.
 
diff --git a/templates/zerver/help/resolve-a-topic.md b/templates/zerver/help/resolve-a-topic.md
index 9dd94946d1..7297fd0a34 100644
--- a/templates/zerver/help/resolve-a-topic.md
+++ b/templates/zerver/help/resolve-a-topic.md
@@ -1,6 +1,6 @@
 # Resolve a topic
 
-Zulip's [topics](/help/about-streams-and-topics) are very
+Zulip's [topics](/help/streams-and-topics) are very
 helpful for customer support, answering questions, investigating
 issues and production errors, and other workflows.
 
diff --git a/templates/zerver/help/about-streams-and-topics.md b/templates/zerver/help/streams-and-topics.md
similarity index 100%
rename from templates/zerver/help/about-streams-and-topics.md
rename to templates/zerver/help/streams-and-topics.md
diff --git a/zerver/lib/onboarding.py b/zerver/lib/onboarding.py
index 401618e348..2bdb08a6eb 100644
--- a/zerver/lib/onboarding.py
+++ b/zerver/lib/onboarding.py
@@ -159,7 +159,7 @@ def send_initial_realm_messages(realm: Realm) -> None:
         _("Topics are a lightweight tool to keep conversations organized.")
         + " "
         + _("You can learn more about topics at [Streams and topics]({about_topics_help_url}).")
-    ).format(about_topics_help_url="/help/about-streams-and-topics")
+    ).format(about_topics_help_url="/help/streams-and-topics")
 
     content_of_swimming_turtles_topic = (
         _(
diff --git a/zerver/lib/test_helpers.py b/zerver/lib/test_helpers.py
index b779a83a13..a3fdac8dd2 100644
--- a/zerver/lib/test_helpers.py
+++ b/zerver/lib/test_helpers.py
@@ -472,6 +472,7 @@ def write_instrumentation_reports(full_suite: bool, include_webhooks: bool) -> N
             "help/change-the-topic-of-a-message",
             "help/configure-missed-message-emails",
             "help/community-topic-edits",
+            "help/about-streams-and-topics",
             "help/delete-a-stream",
             "for/working-groups-and-communities/",
             "help/only-allow-admins-to-add-emoji",
diff --git a/zproject/urls.py b/zproject/urls.py
index 3988a05e7e..4688567c19 100644
--- a/zproject/urls.py
+++ b/zproject/urls.py
@@ -761,6 +761,12 @@ urls += [
         "help/configure-missed-message-emails",
         RedirectView.as_view(url="/help/configure-message-notification-emails", permanent=True),
     ),
+    # This redirect is particularly important, because the old URL
+    # appears in links from Welcome Bot messages.
+    path(
+        "help/about-streams-and-topics",
+        RedirectView.as_view(url="/help/streams-and-topics", permanent=True),
+    ),
     path(
         "help/community-topic-edits",
         RedirectView.as_view(url="/help/configure-who-can-edit-topics", permanent=True),