From 00fffd1681df0903dba37c2059f5fcecee98b26e Mon Sep 17 00:00:00 2001
From: Aman Agrawal <amanagr@zulip.com>
Date: Thu, 28 Apr 2022 10:49:40 +0000
Subject: [PATCH] help: Rename `web-public-streams` page to
 `public-access-option`.

---
 frontend_tests/node_tests/narrow.js                          | 4 ++--
 static/js/narrow_banner.js                                   | 5 +++--
 static/templates/settings/organization_permissions_admin.hbs | 2 +-
 templates/zerver/api/changelog.md                            | 2 +-
 templates/zerver/features.html                               | 2 +-
 templates/zerver/for-open-source.html                        | 2 +-
 templates/zerver/for-research.html                           | 2 +-
 templates/zerver/help/change-the-privacy-of-a-stream.md      | 2 +-
 templates/zerver/help/configure-who-can-create-streams.md    | 4 ++--
 templates/zerver/help/include/sidebar_index.md               | 2 +-
 templates/zerver/help/moderating-open-organizations.md       | 2 +-
 .../help/{web-public-streams.md => public-access-option.md}  | 2 +-
 templates/zerver/help/stream-permissions.md                  | 4 ++--
 zerver/openapi/zulip.yaml                                    | 4 ++--
 14 files changed, 20 insertions(+), 19 deletions(-)
 rename templates/zerver/help/{web-public-streams.md => public-access-option.md} (98%)

diff --git a/frontend_tests/node_tests/narrow.js b/frontend_tests/node_tests/narrow.js
index d64109da72..0d8627e41d 100644
--- a/frontend_tests/node_tests/narrow.js
+++ b/frontend_tests/node_tests/narrow.js
@@ -237,7 +237,7 @@ run_test("show_empty_narrow_message", ({mock_template}) => {
         $(".empty_feed_notice_main").html(),
         empty_narrow_html(
             "",
-            'translated HTML: This stream does not exist or is not <a href="https://zulip.com/help/web-public-streams">web-public</a>.',
+            'translated HTML: This stream does not exist or is not <a href="https://zulip.com/help/public-access-option">publicly accessible</a>.',
         ),
     );
 
@@ -251,7 +251,7 @@ run_test("show_empty_narrow_message", ({mock_template}) => {
         $(".empty_feed_notice_main").html(),
         empty_narrow_html(
             "",
-            'translated HTML: This stream does not exist or is not <a href="https://zulip.com/help/web-public-streams">web-public</a>.',
+            'translated HTML: This stream does not exist or is not <a href="https://zulip.com/help/public-access-option">publicly accessible</a>.',
         ),
     );
     page_params.is_spectator = false;
diff --git a/static/js/narrow_banner.js b/static/js/narrow_banner.js
index 7b73891ff6..688e09babe 100644
--- a/static/js/narrow_banner.js
+++ b/static/js/narrow_banner.js
@@ -11,11 +11,12 @@ const SPECTATOR_STREAM_NARROW_BANNER = {
     title: "",
     html: $t_html(
         {
-            defaultMessage: "This stream does not exist or is not <z-link>web-public</z-link>.",
+            defaultMessage:
+                "This stream does not exist or is not <z-link>publicly accessible</z-link>.",
         },
         {
             "z-link": (content_html) =>
-                `<a href="https://zulip.com/help/web-public-streams">${content_html}</a>`,
+                `<a href="https://zulip.com/help/public-access-option">${content_html}</a>`,
         },
     ),
 };
diff --git a/static/templates/settings/organization_permissions_admin.hbs b/static/templates/settings/organization_permissions_admin.hbs
index 5f3d9bd492..ef0573aa53 100644
--- a/static/templates/settings/organization_permissions_admin.hbs
+++ b/static/templates/settings/organization_permissions_admin.hbs
@@ -109,7 +109,7 @@
                   is_checked=realm_enable_spectator_access
                   label=admin_settings_label.realm_enable_spectator_access
                   is_disabled=disable_enable_spectator_access_setting
-                  help_link="help/web-public-streams"}}
+                  help_link="help/public-access-option"}}
                 <div class="input-group realm_create_web_public_stream_policy">
                     <label for="realm_create_web_public_stream_policy" class="dropdown-title">{{t "Who can create web-public streams" }}</label>
                     <select name="realm_create_web_public_stream_policy" id="id_realm_create_web_public_stream_policy" class="prop-element" data-setting-widget-type="number">
diff --git a/templates/zerver/api/changelog.md b/templates/zerver/api/changelog.md
index f1d5043fc3..932d6d485c 100644
--- a/templates/zerver/api/changelog.md
+++ b/templates/zerver/api/changelog.md
@@ -114,7 +114,7 @@ No changes; feature level used for Zulip 5.0 release.
 * [`GET /server_settings`](/api/get-server-settings): Added
   `realm_web_public_access_enabled` as a realm-specific server setting,
   which can be used by clients to detect whether the realm allows and
-  has at least one [web-public stream](/help/web-public-streams).
+  has at least one [web-public stream](/help/public-access-option).
 
 **Feature level 115**
 
diff --git a/templates/zerver/features.html b/templates/zerver/features.html
index bcb18049af..fe51fc7770 100644
--- a/templates/zerver/features.html
+++ b/templates/zerver/features.html
@@ -316,7 +316,7 @@
                 A full suite of tools for moderating open communities.
             </p>
         </a>
-        <a class="feature-block" href="/help/web-public-streams" target="_blank" rel="noopener noreferrer">
+        <a class="feature-block" href="/help/public-access-option" target="_blank" rel="noopener noreferrer">
             <h3>PUBLIC ACCESS OPTION</h3>
             <p>
                 Enable transparency by setting streams to be viewable
diff --git a/templates/zerver/for-open-source.html b/templates/zerver/for-open-source.html
index c8d3d8474f..b4bd1a2d22 100644
--- a/templates/zerver/for-open-source.html
+++ b/templates/zerver/for-open-source.html
@@ -120,7 +120,7 @@
                     </li>
                     <li>
                         <div class="list-content">
-                            With the <a href="/help/web-public-streams">public
+                            With the <a href="/help/public-access-option">public
                             access option</a>, anyone can view, browse, and
                             search your organization's public content — no
                             account required.
diff --git a/templates/zerver/for-research.html b/templates/zerver/for-research.html
index f7af68a7a5..867e310747 100644
--- a/templates/zerver/for-research.html
+++ b/templates/zerver/for-research.html
@@ -135,7 +135,7 @@
                     </li>
                     <li>
                         <div class="list-content">
-                            With the <a href="/help/web-public-streams">public
+                            With the <a href="/help/public-access-option">public
                             access option</a>, anyone can view, browse, and
                             search your organization's public content — no
                             account required.
diff --git a/templates/zerver/help/change-the-privacy-of-a-stream.md b/templates/zerver/help/change-the-privacy-of-a-stream.md
index a922298d6f..8c5ec98657 100644
--- a/templates/zerver/help/change-the-privacy-of-a-stream.md
+++ b/templates/zerver/help/change-the-privacy-of-a-stream.md
@@ -2,7 +2,7 @@
 
 {!admin-only.md!}
 
-Streams can be [web-public](/help/web-public-streams), public or private,
+Streams can be [web-public](/help/public-access-option), public or private,
 and private streams can have shared or protected history.
 See [stream permissions](/help/stream-permissions) for
 details on stream privacy settings.
diff --git a/templates/zerver/help/configure-who-can-create-streams.md b/templates/zerver/help/configure-who-can-create-streams.md
index f24aa47c69..633b0885b2 100644
--- a/templates/zerver/help/configure-who-can-create-streams.md
+++ b/templates/zerver/help/configure-who-can-create-streams.md
@@ -3,7 +3,7 @@
 {!admin-only.md!}
 
 Zulip allows you to separately control [permissions](/help/roles-and-permissions)
-for creating [web-public](/help/web-public-streams), public and private
+for creating [web-public](/help/public-access-option), public and private
 streams.
 
 For corporations and other organizations with controlled access, we
@@ -12,7 +12,7 @@ self-organize.
 
 Only users in trusted roles (moderators and administrators) can be
 given permission to create web-public streams. This is intended
-[to help manage abuse](/help/web-public-streams#managing-abuse) by
+[to help manage abuse](/help/public-access-option#managing-abuse) by
 making it hard for an attacker to host malicious content in an
 unadvertised web-public stream in a legitimate organization.
 
diff --git a/templates/zerver/help/include/sidebar_index.md b/templates/zerver/help/include/sidebar_index.md
index 95b8753724..6114648448 100755
--- a/templates/zerver/help/include/sidebar_index.md
+++ b/templates/zerver/help/include/sidebar_index.md
@@ -161,7 +161,7 @@
 
 ## Stream management
 * [Stream permissions](/help/stream-permissions)
-* [Public access option](/help/web-public-streams)
+* [Public access option](/help/public-access-option)
 * [Stream posting policy](/help/stream-sending-policy)
 * [Restrict stream creation](/help/configure-who-can-create-streams)
 * [Restrict stream invitation](/help/configure-who-can-invite-to-streams)
diff --git a/templates/zerver/help/moderating-open-organizations.md b/templates/zerver/help/moderating-open-organizations.md
index fd1e06ce3c..3c0bde33d1 100644
--- a/templates/zerver/help/moderating-open-organizations.md
+++ b/templates/zerver/help/moderating-open-organizations.md
@@ -60,4 +60,4 @@ organization's policy choices.
 ## Related articles
 
 * [Setting up your organization](/help/getting-your-organization-started-with-zulip)
-* [Web-public streams](/help/web-public-streams)
+* [Public access option](/help/public-access-option)
diff --git a/templates/zerver/help/web-public-streams.md b/templates/zerver/help/public-access-option.md
similarity index 98%
rename from templates/zerver/help/web-public-streams.md
rename to templates/zerver/help/public-access-option.md
index 2533203f92..a69c89214d 100644
--- a/templates/zerver/help/web-public-streams.md
+++ b/templates/zerver/help/public-access-option.md
@@ -108,7 +108,7 @@ detailed below.
   required for Zulip to load, and may thus be [accessed via the Zulip API][info-via-api].
 * Logged out visitors cannot view [organization statistics](/help/analytics).
 
-[info-via-api]: /help/web-public-streams#information-that-can-be-accessed-via-api-when-web-public-streams-are-enabled
+[info-via-api]: /help/public-access-option#information-that-can-be-accessed-via-api-when-web-public-streams-are-enabled
 
 ### Information about users
 
diff --git a/templates/zerver/help/stream-permissions.md b/templates/zerver/help/stream-permissions.md
index 0bb4cda4c5..83b0d335df 100644
--- a/templates/zerver/help/stream-permissions.md
+++ b/templates/zerver/help/stream-permissions.md
@@ -16,7 +16,7 @@ determine who receives a message. Zulip supports a few types of streams:
     * In **private streams with protected history**, new subscribers
     can only see messages sent after they join.
 
-* [**Web-public**](/help/web-public-streams) (<i class="zulip-icon
+* [**Web-public**](/help/public-access-option) (<i class="zulip-icon
   zulip-icon-globe"></i>): Members can join (guests must be invited by a
   subscriber). Anyone on the Internet can view complete message history without
   creating an account.
@@ -113,4 +113,4 @@ must be subscribed to the stream.</span>
 
 * [Roles and permissions](/help/roles-and-permissions)
 * [Stream sending policy](/help/stream-sending-policy)
-* [Web-public streams](/help/web-public-streams)
+* [Web-public streams](/help/public-access-option)
diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml
index 8f6e38855c..1b4c7a7d56 100644
--- a/zerver/openapi/zulip.yaml
+++ b/zerver/openapi/zulip.yaml
@@ -11699,7 +11699,7 @@ paths:
 
                           The value of the `WEB_PUBLIC_STREAMS_ENABLED` Zulip server level
                           setting. A server that has disabled this setting intends to not offer [web
-                          public streams](/help/web-public-streams) to realms it hosts. (Zulip Cloud
+                          public streams](/help/public-access-option) to realms it hosts. (Zulip Cloud
                           defaults to `True`; self-hosted servers default to `False`).
 
                           Clients should use this to determine whether to offer UI for the
@@ -12520,7 +12520,7 @@ paths:
                         type: boolean
                         description: |
                           Whether the organization has enabled the creation of
-                          [web-public streams](/help/web-public-streams) and
+                          [web-public streams](/help/public-access-option) and
                           at least one web-public stream on the server currently
                           exists. Clients that support viewing content
                           in web-public streams without an account can