help: Merge "Change who can add custom emoji" into "Custom emoji" page.

templates/zerver/help/configure-who-can-add-custom-emoji.md

@@ -1,24 +0,0 @@
-# Change who can add custom emoji
-
-{!admin-only.md!}
-
-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:
-
-* Organization administrators
-* Organization administrators and moderators
-* Organization administrators and all members
-* Organization administrators and [full members](/help/restrict-permissions-of-new-members)
-
-### Change who can add custom emoji
-
-{start_tabs}
-
-{settings_tab|organization-permissions}
-
-2. Under **Other permissions**, configure **Who can add custom emoji**.
-
-{!save-changes.md!}
-
-{end_tabs}

templates/zerver/help/custom-emoji.md

@@ -1,10 +1,6 @@
 # Custom emoji
 
-By default, anyone other than guests can add custom emoji to a Zulip organization. Added emoji
-are available to all users.
-
-Organization administrators can also
-[change who can add custom emoji](/help/configure-who-can-add-custom-emoji).
+Any custom emoji an organization has uploaded are available to all users.
 
 ## Add custom emoji
 
@@ -55,6 +51,32 @@ Deleting an emoji will not affect any existing messages or emoji
 reactions. Anyone can delete custom emoji they added, and organization
 administrators can delete anyone's custom emoji.
 
+## Editing permissions
+
+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:
+
+* Organization administrators
+* Organization administrators and moderators
+* Organization administrators and all members
+* Organization administrators and [full members](/help/restrict-permissions-of-new-members)
+
+### Change who can add custom emoji
+
+{!admin-only.md!}
+
+{start_tabs}
+
+{settings_tab|organization-permissions}
+
+2. Under **Other permissions**, configure **Who can add custom emoji**.
+
+{!save-changes.md!}
+
+{end_tabs}
+
 ## Related articles
 
-* [Change who can add custom emoji](/help/configure-who-can-add-custom-emoji)
+* [Emoji and emoticons](/help/emoji-and-emoticons)
+* [Emoji reactions](/help/emoji-reactions)

templates/zerver/help/include/sidebar_index.md

@@ -177,7 +177,6 @@
 * [Restrict private messages](/help/restrict-private-messages)
 * [Restrict user group management](/help/restrict-user-group-management)
 * [Restrict wildcard mentions](/help/restrict-wildcard-mentions)
-* [Change who can add custom emoji](/help/configure-who-can-add-custom-emoji)
 * [Block image and link previews](/help/allow-image-link-previews)
 * [Disable message edit history](/help/disable-message-edit-history)
 * [Manage editing of old messages](/help/configure-message-editing-and-deletion)

templates/zerver/help/moderating-open-organizations.md

@@ -14,7 +14,7 @@ problematic behavior:
 * Restrict who can [create streams](/help/configure-who-can-create-streams),
   [create bots](/help/restrict-bot-creation), [send private
   messages](/help/restrict-private-messages), or
-  [add custom emoji](/help/configure-who-can-add-custom-emoji).
+  [add custom emoji](/help/custom-emoji#change-who-can-add-custom-emoji).
 * Link to a code of conduct in your
   [organization description](/help/create-your-organization-profile)
   (displayed on the registration page).

templates/zerver/help/restrict-permissions-of-new-members.md

@@ -18,7 +18,7 @@ Currently, the following actions support limiting access to full members.
 - [Adding users to streams](/help/configure-who-can-invite-to-streams)
 - [Restricting posting to a stream](/help/stream-sending-policy)
 - [Restricting inviting users to organization](/help/invite-new-users)
-- [Restricting adding custom emoji](/help/configure-who-can-add-custom-emoji)
+- [Restricting adding custom emoji](/help/custom-emoji#change-who-can-add-custom-emoji)
 
 ### Set waiting period for new members
 

templates/zerver/security.md

@@ -53,7 +53,7 @@ priority.
 - Zulip also supports customizing whether non-admins can
   [create streams](/help/configure-who-can-create-streams),
   [invite to streams](/help/configure-who-can-invite-to-streams),
-  [add custom emoji](/help/configure-who-can-add-custom-emoji),
+  [add custom emoji](/help/custom-emoji#change-who-can-add-custom-emoji),
   [add integrations and bots](/help/restrict-bot-creation),
   [edit or delete messages](/help/configure-message-editing-and-deletion),
   and more.

zerver/lib/test_helpers.py

@@ -470,6 +470,7 @@ def write_instrumentation_reports(full_suite: bool, include_webhooks: bool) -> N
             "node-coverage/(?P<path>.+)",
             "docs/(?P<path>.+)",
             "help/add-custom-emoji",
+            "help/configure-who-can-add-custom-emoji",
             "help/change-the-topic-of-a-message",
             "help/configure-missed-message-emails",
             "help/community-topic-edits",

zproject/urls.py

@@ -773,7 +773,15 @@ urls += [
     ),
     path(
         "help/only-allow-admins-to-add-emoji",
-        RedirectView.as_view(url="/help/configure-who-can-add-custom-emoji", permanent=True),
+        RedirectView.as_view(
+            url="/help/custom-emoji#change-who-can-add-custom-emoji", permanent=True
+        ),
+    ),
+    path(
+        "help/configure-who-can-add-custom-emoji",
+        RedirectView.as_view(
+            url="/help/custom-emoji#change-who-can-add-custom-emoji", permanent=True
+        ),
     ),
     path(
         "help/add-custom-emoji",