From 302aba035ac9f8dfe304a423468c0bf037f752b1 Mon Sep 17 00:00:00 2001
From: Alya Abbott <alya@zulip.com>
Date: Fri, 17 Sep 2021 15:52:26 -0700
Subject: [PATCH] help: Rename add-custom-emoji -> custom-emoji.

---
 templates/zerver/for-companies.html                       | 2 +-
 templates/zerver/for-education.html                       | 2 +-
 templates/zerver/for-events.html                          | 2 +-
 templates/zerver/for-research.html                        | 2 +-
 .../zerver/help/configure-who-can-add-custom-emoji.md     | 2 +-
 .../zerver/help/{add-custom-emoji.md => custom-emoji.md}  | 2 +-
 templates/zerver/help/emoji-and-emoticons.md              | 2 +-
 templates/zerver/help/emoji-reactions.md                  | 4 ++--
 .../zerver/help/format-your-message-using-markdown.md     | 2 +-
 .../help/include/customize-organization-settings.md       | 2 +-
 templates/zerver/help/include/sidebar_index.md            | 2 +-
 templates/zerver/help/moderating-open-organizations.md    | 2 +-
 zerver/lib/test_helpers.py                                | 1 +
 zerver/openapi/zulip.yaml                                 | 8 ++++----
 zproject/urls.py                                          | 4 ++++
 15 files changed, 22 insertions(+), 17 deletions(-)
 rename templates/zerver/help/{add-custom-emoji.md => custom-emoji.md} (98%)

diff --git a/templates/zerver/for-companies.html b/templates/zerver/for-companies.html
index e543428820..82db1c25a8 100644
--- a/templates/zerver/for-companies.html
+++ b/templates/zerver/for-companies.html
@@ -343,7 +343,7 @@
                             Use <a href="/help/emoji-reactions">emoji
                             reactions</a> for lightweight
                             interactions. Have fun
-                            with <a href="/help/add-custom-emoji">custom
+                            with <a href="/help/custom-emoji">custom
                             emoji</a> and gather feedback
                             with <a href="/help/create-a-poll">polls</a>.
                         </div>
diff --git a/templates/zerver/for-education.html b/templates/zerver/for-education.html
index 868e6944b8..830f58b13a 100644
--- a/templates/zerver/for-education.html
+++ b/templates/zerver/for-education.html
@@ -122,7 +122,7 @@
                             Use <a href="/help/emoji-reactions">emoji
                             reactions</a> for lightweight
                             interactions. Have fun
-                            with <a href="/help/add-custom-emoji">custom
+                            with <a href="/help/custom-emoji">custom
                             emoji</a> and gather feedback
                             with <a href="/help/create-a-poll">polls</a>.
                         </div>
diff --git a/templates/zerver/for-events.html b/templates/zerver/for-events.html
index b5e26c1345..78286ca311 100644
--- a/templates/zerver/for-events.html
+++ b/templates/zerver/for-events.html
@@ -115,7 +115,7 @@
                 <ul>
                     <li><div class="list-content">Share the agenda and presentations with
                     <a href="/help/share-and-upload-files">drag-and-drop file uploads</a>.</div></li>
-                    <li><div class="list-content">Use <a href="/help/emoji-reactions">emoji reactions</a> for lightweight interactions. Have fun with <a href="/help/add-custom-emoji">custom emoji</a>, or get feedback with a <a href="/help/create-a-poll">poll</a>.</div></li>
+                    <li><div class="list-content">Use <a href="/help/emoji-reactions">emoji reactions</a> for lightweight interactions. Have fun with <a href="/help/custom-emoji">custom emoji</a>, or get feedback with a <a href="/help/create-a-poll">poll</a>.</div></li>
                     <li><div class="list-content">Announce the schedule without worrying about time zones using <a href="/help/format-your-message-using-markdown#mention-a-time">local times</a>.</div></li>
                     <li><div class="list-content">Make a <a href="/help/start-a-call">video call</a> with the click of a button.</div></li>
                     <li><div class="list-content">Use Zulip in your language of choice, with translations into <a href="https://www.transifex.com/zulip/zulip/">17 languages</a>.</div></li>
diff --git a/templates/zerver/for-research.html b/templates/zerver/for-research.html
index bb3d1b51f2..ae7650cacf 100644
--- a/templates/zerver/for-research.html
+++ b/templates/zerver/for-research.html
@@ -200,7 +200,7 @@
                             Use <a href="/help/emoji-reactions">emoji
                             reactions</a> for lightweight
                             interactions. Have fun
-                            with <a href="/help/add-custom-emoji">custom
+                            with <a href="/help/custom-emoji">custom
                             emoji</a> and gather feedback
                             with <a href="/help/create-a-poll">polls</a>.
                         </div>
diff --git a/templates/zerver/help/configure-who-can-add-custom-emoji.md b/templates/zerver/help/configure-who-can-add-custom-emoji.md
index 1c39d84d25..f4e7844251 100644
--- a/templates/zerver/help/configure-who-can-add-custom-emoji.md
+++ b/templates/zerver/help/configure-who-can-add-custom-emoji.md
@@ -2,7 +2,7 @@
 
 {!admin-only.md!}
 
-By default, anyone other than guests can [add custom emoji](/help/add-custom-emoji) to the
+By default, anyone other than guests can [add custom emoji](/help/custom-emoji) to the
 organization. However, you can restrict the permission to add custom emoji to other sets of
 roles:
 
diff --git a/templates/zerver/help/add-custom-emoji.md b/templates/zerver/help/custom-emoji.md
similarity index 98%
rename from templates/zerver/help/add-custom-emoji.md
rename to templates/zerver/help/custom-emoji.md
index fcc4f36f14..357f11d593 100644
--- a/templates/zerver/help/add-custom-emoji.md
+++ b/templates/zerver/help/custom-emoji.md
@@ -1,4 +1,4 @@
-# Add custom emoji
+# Custom emoji
 
 By default, anyone other than guests can add custom emoji to a Zulip organization. Added emoji
 are available to all users.
diff --git a/templates/zerver/help/emoji-and-emoticons.md b/templates/zerver/help/emoji-and-emoticons.md
index 45f656f693..a1fd8482cb 100644
--- a/templates/zerver/help/emoji-and-emoticons.md
+++ b/templates/zerver/help/emoji-and-emoticons.md
@@ -71,6 +71,6 @@ you send. The default is **Google modern**.
 
 ## Related articles
 
-* [Add custom emoji](/help/add-custom-emoji)
+* [Add custom emoji](/help/custom-emoji)
 * [Emoji reactions](/help/emoji-reactions)
 * [View emoji as text](/help/view-emoji-as-text)
diff --git a/templates/zerver/help/emoji-reactions.md b/templates/zerver/help/emoji-reactions.md
index 02cbb95e4b..84b1694319 100644
--- a/templates/zerver/help/emoji-reactions.md
+++ b/templates/zerver/help/emoji-reactions.md
@@ -2,7 +2,7 @@
 
 Emoji reactions allow you to react to messages with fun little emoji. Any
 emoji can be used as a reaction, including
-[custom emoji](/help/add-custom-emoji). Reactions appear in little boxes
+[custom emoji](/help/custom-emoji). Reactions appear in little boxes
 underneath the message.
 
 ## Add a reaction
@@ -41,6 +41,6 @@ added to remove it.
 
 ## Related articles
 
-* [Add custom emoji](/help/add-custom-emoji)
+* [Add custom emoji](/help/custom-emoji)
 * [View emoji reactions as text](/help/view-emoji-as-text)
 * [Emoji in messages](/help/emoji-and-emoticons)
diff --git a/templates/zerver/help/format-your-message-using-markdown.md b/templates/zerver/help/format-your-message-using-markdown.md
index 282ba376b5..3114a10a52 100644
--- a/templates/zerver/help/format-your-message-using-markdown.md
+++ b/templates/zerver/help/format-your-message-using-markdown.md
@@ -173,7 +173,7 @@ Clicking the arrow will expand the spoiler content:
 
 To translate emoticons into emoji, you'll need to
 [enable emoticon translations](/help/enable-emoticon-translations).
-You can also [add custom emoji](/help/add-custom-emoji).
+You can also [add custom emoji](/help/custom-emoji).
 
 ```
 :octopus: :heart: :zulip: :)
diff --git a/templates/zerver/help/include/customize-organization-settings.md b/templates/zerver/help/include/customize-organization-settings.md
index c079b998d9..fceea13295 100644
--- a/templates/zerver/help/include/customize-organization-settings.md
+++ b/templates/zerver/help/include/customize-organization-settings.md
@@ -25,7 +25,7 @@ A few settings to highlight:
   linkifiers](/help/add-a-custom-linkifier) to make it easy to link to
   issues (e.g. just by typing #1234 for issue 1234).
 
-* [Add custom emoji](/help/add-custom-emoji), including your organization's logo.
+* [Add custom emoji](/help/custom-emoji), including your organization's logo.
 
 For many other settings, e.g. [message and topic editing
 permissions][topic-editing-permissions], you can experience how Zulip
diff --git a/templates/zerver/help/include/sidebar_index.md b/templates/zerver/help/include/sidebar_index.md
index 839cfa381b..a1471a296a 100644
--- a/templates/zerver/help/include/sidebar_index.md
+++ b/templates/zerver/help/include/sidebar_index.md
@@ -170,7 +170,7 @@
 * [Delete a topic](/help/delete-a-topic)
 
 ## Organization settings
-* [Add custom emoji](/help/add-custom-emoji)
+* [Custom emoji](/help/custom-emoji)
 * [Add a custom linkifier](/help/add-a-custom-linkifier)
 * [Restrict topic editing](/help/configure-who-can-edit-topics)
 * [Require topics in stream messages](/help/require-topics)
diff --git a/templates/zerver/help/moderating-open-organizations.md b/templates/zerver/help/moderating-open-organizations.md
index 98c8af970f..78aac63583 100644
--- a/templates/zerver/help/moderating-open-organizations.md
+++ b/templates/zerver/help/moderating-open-organizations.md
@@ -51,7 +51,7 @@ organization's policy choices.
 * [Change users' names](/help/change-a-users-name) (e.g. to "Name (Spammer)")
   for users who sent spam private messages to many community members.
 * [Deactivate bots](/help/deactivate-or-reactivate-a-bot) or
-  [delete custom emoji](/help/add-custom-emoji#delete-custom-emoji).
+  [delete custom emoji](/help/custom-emoji#delete-custom-emoji).
 
 ## In the works
 
diff --git a/zerver/lib/test_helpers.py b/zerver/lib/test_helpers.py
index a3fdac8dd2..e104c390cf 100644
--- a/zerver/lib/test_helpers.py
+++ b/zerver/lib/test_helpers.py
@@ -469,6 +469,7 @@ def write_instrumentation_reports(full_suite: bool, include_webhooks: bool) -> N
             "confirmation_key/",
             "node-coverage/(?P<path>.+)",
             "docs/(?P<path>.+)",
+            "help/add-custom-emoji",
             "help/change-the-topic-of-a-message",
             "help/configure-missed-message-emails",
             "help/community-topic-edits",
diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml
index 320b12f967..34e20ee69e 100644
--- a/zerver/openapi/zulip.yaml
+++ b/zerver/openapi/zulip.yaml
@@ -2825,7 +2825,7 @@ paths:
                               additionalProperties: false
                               description: |
                                 Event sent to all users in a Zulip organization when
-                                a [custom emoji](/help/add-custom-emoji) has been updated,
+                                a [custom emoji](/help/custom-emoji) has been updated,
                                 typically when a new emoji has been added or an old one
                                 has been deactivated. The event contains all custom emoji
                                 configured for the organization, not just the updated
@@ -6368,7 +6368,7 @@ paths:
 
             - `unicode_emoji`: Unicode emoji (`emoji_code` will be its Unicode
               codepoint).
-            - `realm_emoji`: [Custom emoji](/help/add-custom-emoji).
+            - `realm_emoji`: [Custom emoji](/help/custom-emoji).
               (`emoji_code` will be its ID).
             - `zulip_extra_emoji`: Special emoji included with Zulip. Exists to
               namespace the `zulip` emoji.
@@ -14133,7 +14133,7 @@ components:
 
             - `unicode_emoji`: Unicode emoji (`emoji_code` will be its Unicode
               codepoint).
-            - `realm_emoji`: [Custom emoji](/help/add-custom-emoji).
+            - `realm_emoji`: [Custom emoji](/help/custom-emoji).
               (`emoji_code` will be its ID).
             - `zulip_extra_emoji`: Special emoji included with Zulip. Exists to
               namespace the `zulip` emoji.
@@ -15205,7 +15205,7 @@ components:
           namespace the `zulip` emoji.
 
         **Changes**: In Zulip 3.0 (feature level 2), this become
-        optional for [custom emoji](/help/add-custom-emoji);
+        optional for [custom emoji](/help/custom-emoji);
         previously, this endpoint assumed `unicode_emoji` if this
         parameter was not specified.
       schema:
diff --git a/zproject/urls.py b/zproject/urls.py
index 4688567c19..e5b702c614 100644
--- a/zproject/urls.py
+++ b/zproject/urls.py
@@ -775,6 +775,10 @@ urls += [
         "help/only-allow-admins-to-add-emoji",
         RedirectView.as_view(url="/help/configure-who-can-add-custom-emoji", permanent=True),
     ),
+    path(
+        "help/add-custom-emoji",
+        RedirectView.as_view(url="/help/custom-emoji", permanent=True),
+    ),
     path("help/", help_documentation_view),
     path("help/<path:article>", help_documentation_view),
     path("api/", api_documentation_view),