docs: Update .html links pointing to "Upgrade Zulip" or "Modify Zulip".

drrosa · timabbott · commit d205850d54f7 · 2023-08-11T16:49:32.000-07:00
Follow-up to zulip#24089.
diff --git a/SECURITY.md b/SECURITY.md
@@ -33,5 +33,5 @@ See also our documentation on the [Zulip release
 lifecycle][release-lifecycle].
 
 [security-model]: https://zulip.readthedocs.io/en/latest/production/security-model.html
-[upgrades]: https://zulip.readthedocs.io/en/latest/production/upgrade-or-modify.html#upgrading-to-a-release
+[upgrades]: https://zulip.readthedocs.io/en/stable/production/upgrade.html#upgrading-to-a-release
 [release-lifecycle]: https://zulip.readthedocs.io/en/latest/overview/release-lifecycle.html
diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
@@ -6,7 +6,7 @@
     # version e.g. to say that something is likely to have changed.
     # For more info see: https://www.sphinx-doc.org/en/master/templating.html
     #}
-    {% if pagename in ["production/modify", "production/upgrade", "production/scim"] and release.endswith('+git') %}
+    {% if pagename in [] and release.endswith('+git') %}
     {#
     # This page doesn't exist in the stable documentation yet.
     # This temporary workaround prevents test failures and should be removed after the next release.
diff --git a/help/include/advantages-of-self-hosting-zulip.md b/help/include/advantages-of-self-hosting-zulip.md
@@ -22,5 +22,5 @@ Learn more about [self-hosting Zulip](https://zulip.com/self-hosting/).
 [zulip-github]: https://github.com/zulip/zulip#readme
 [install-zulip]: https://zulip.readthedocs.io/en/stable/production/install.html
 [back-up-zulip]: https://zulip.readthedocs.io/en/stable/production/export-and-import.html#backups
-[maintain-zulip]: https://zulip.readthedocs.io/en/stable/production/upgrade-or-modify.html
-[modify-zulip]: https://zulip.readthedocs.io/en/stable/production/upgrade-or-modify.html#modifying-zulip
+[maintain-zulip]: https://zulip.readthedocs.io/en/stable/production/upgrade.html
+[modify-zulip]: https://zulip.readthedocs.io/en/stable/production/modify.html
diff --git a/help/setting-up-zulip-for-a-class.md b/help/setting-up-zulip-for-a-class.md
@@ -71,7 +71,7 @@ ensure you can always move from our hosting to yours (and back).
 
 [install-zulip]: https://zulip.readthedocs.io/en/stable/production/install.html
 [back-up-zulip]: https://zulip.readthedocs.io/en/stable/production/export-and-import.html#backups
-[maintain-zulip]: https://zulip.readthedocs.io/en/stable/production/upgrade-or-modify.html
+[maintain-zulip]: https://zulip.readthedocs.io/en/stable/production/upgrade.html
 
 
 ## Do I need a separate Zulip organization for each class?
diff --git a/help/view-zulip-version.md b/help/view-zulip-version.md
@@ -10,7 +10,7 @@ web app your organization is using.
 Zulip Cloud organizations are always updated to the latest version of Zulip.
 
 [upgrade-zulip]:
-    https://zulip.readthedocs.io/en/latest/production/upgrade-or-modify.html
+    https://zulip.readthedocs.io/en/stable/production/upgrade.html
 [changelog]: https://zulip.readthedocs.io/en/latest/overview/changelog.html
 
 ### View Zulip server and web app version
diff --git a/scripts/lib/check-database-compatibility b/scripts/lib/check-database-compatibility
@@ -56,7 +56,7 @@ if os.path.exists("/etc/init.d/postgresql") and os.path.exists("/etc/zulip/zulip
             "\n"
             "In general, this results from manually upgrading PostgreSQL; you\n"
             "should follow our instructions for using our tool to do so:\n"
-            "https://zulip.readthedocs.io/en/latest/production/upgrade.html#upgrading-postgresql",
+            "https://zulip.readthedocs.io/en/stable/production/upgrade.html#upgrading-postgresql",
             postgresql_version,
             django_pg_version,
         )
@@ -66,8 +66,8 @@ if django_pg_version < 12:
     logging.critical("Unsupported PostgreSQL version: %d", postgresql_version)
     logging.info(
         "Please upgrade to PostgreSQL 12 or newer first.\n"
-        "See https://zulip.readthedocs.io/en/latest/production/"
-        "upgrade-or-modify.html#upgrading-postgresql"
+        "See https://zulip.readthedocs.io/en/stable/production/"
+        "upgrade.html#upgrading-postgresql"
     )
     sys.exit(1)
 
diff --git a/scripts/lib/upgrade-zulip-stage-2 b/scripts/lib/upgrade-zulip-stage-2
@@ -55,7 +55,7 @@ def error_desupported_os(vendor: str, os_version: str) -> NoReturn:
         "Sorry! The support for your OS has been discontinued.\n"
         "Please upgrade your OS to a supported release first.\n"
         "See https://zulip.readthedocs.io/en/latest/production/"
-        "upgrade-or-modify.html#upgrading-the-operating-system"
+        "upgrade.html#upgrading-the-operating-system"
     )
     sys.exit(1)
 
diff --git a/templates/corporate/for/business.html b/templates/corporate/for/business.html
@@ -449,7 +449,7 @@ <h1>
                             Zulip Cloud is built with <a href="/policies/privacy">privacy</a> and <a href="/security/">security</a> in mind, and is used by some of the most security-conscious organizations in the world.
                         </div>
                     </li>
-                    <li><div class="list-content">Zulip is <a href="https://github.com/zulip">100% open-source software</a>, with no "open core" catch. We work hard to make it <a href="https://zulip.readthedocs.io/en/latest/production/install.html">easy to set up</a>, <a href="https://zulip.readthedocs.io/en/stable/production/export-and-import.html#backups">back up</a>, and <a href="https://zulip.readthedocs.io/en/stable/production/upgrade-or-modify.html">maintain</a> a self-hosted Zulip installation, where you have full control of your data.</div></li>
+                    <li><div class="list-content">Zulip is <a href="https://github.com/zulip">100% open-source software</a>, with no "open core" catch. We work hard to make it <a href="https://zulip.readthedocs.io/en/latest/production/install.html">easy to set up</a>, <a href="https://zulip.readthedocs.io/en/stable/production/export-and-import.html#backups">back up</a>, and <a href="https://zulip.readthedocs.io/en/stable/production/upgrade.html">maintain</a> a self-hosted Zulip installation, where you have full control of your data.</div></li>
                     <li><div class="list-content">Move your data with our high quality <a href="/help/export-your-organization">export</a> and <a href="https://zulip.readthedocs.io/en/latest/production/export-and-import.html">import</a> tools; you are never locked into a proprietary tool.</div></li>
                     <li><div class="list-content">Zulip is built for scale and works reliably for organizations with thousands of users online at once with <a href="https://zulip.readthedocs.io/en/stable/production/requirements.html#scalability">modest hardware</a>.</div></li>
                     <li>
diff --git a/templates/corporate/for/open-source.html b/templates/corporate/for/open-source.html
@@ -268,7 +268,7 @@ <h1>
                             open-source software</a>, with no "open core"
                             catch. We work hard to make it <a href="https://zulip.readthedocs.io/en/latest/production/install.html">easy to set up</a>,
                             <a href="https://zulip.readthedocs.io/en/stable/production/export-and-import.html#backups">backup</a>,
-                            and <a href="https://zulip.readthedocs.io/en/stable/production/upgrade-or-modify.html">maintain</a>
+                            and <a href="https://zulip.readthedocs.io/en/stable/production/upgrade.html">maintain</a>
                             a self-hosted Zulip installation, where you
                             have full control of your data.
                         </div>
diff --git a/templates/corporate/pricing_model.html b/templates/corporate/pricing_model.html
@@ -124,7 +124,7 @@ <h2>Free</h2>
                             <li><a href="https://zulip.readthedocs.io/en/stable/production/authentication-methods.html#synchronizing-data">LDAP/Active Directory sync</a></li>
                             <li>Advanced <a href="/help/roles-and-permissions">roles</a> and <a href="/help/stream-permissions">permissions</a></li>
                             <li>Easy <a href="https://zulip.readthedocs.io/en/stable/production/install.html">installation</a>
-                                and <a href="https://zulip.readthedocs.io/en/stable/production/upgrade-or-modify.html">maintenance</a></li>
+                                and <a href="https://zulip.readthedocs.io/en/stable/production/upgrade.html">maintenance</a></li>
                         </ul>
                     </div>
                     <div class="bottom">
diff --git a/templates/corporate/self-hosting.html b/templates/corporate/self-hosting.html
@@ -144,7 +144,7 @@ <h1>
                         Our well-documented scripts help you
                         <a href="https://zulip.readthedocs.io/en/stable/production/install.html">setup</a>,
                         <a href="https://zulip.readthedocs.io/en/stable/production/export-and-import.html#backups">backup</a>, and
-                        <a href="https://zulip.readthedocs.io/en/stable/production/upgrade-or-modify.html">upgrade</a>
+                        <a href="https://zulip.readthedocs.io/en/stable/production/upgrade.html">upgrade</a>
                         your self-hosted Zulip installation. Migrate your
                         <a href="/help/migrating-from-other-chat-tools">data</a>
                         and <a href="/integrations/doc/slack_incoming">integrations</a>
@@ -242,7 +242,7 @@ <h1>
                     </p>
                     <p>
                         Zulip makes it easy to
-                        <a href="https://zulip.readthedocs.io/en/stable/production/upgrade-or-modify.html#modifying-zulip">
+                        <a href="https://zulip.readthedocs.io/en/stable/production/modify.html">
                         maintain a fork</a> with customized features, with 175,000 words of documentation for
                         system administrators and developers.
                     </p>
@@ -292,7 +292,7 @@ <h2>Free</h2>
                                     <li><a href="https://zulip.readthedocs.io/en/stable/production/authentication-methods.html#synchronizing-data">LDAP/Active Directory sync</a></li>
                                     <li>Advanced <a href="/help/roles-and-permissions">roles</a> and <a href="/help/stream-permissions">permissions</a></li>
                                     <li>Easy <a href="https://zulip.readthedocs.io/en/stable/production/install.html">installation</a>
-                                        and <a href="https://zulip.readthedocs.io/en/stable/production/upgrade-or-modify.html">maintenance</a></li>
+                                        and <a href="https://zulip.readthedocs.io/en/stable/production/upgrade.html">maintenance</a></li>
                                 </ul>
                             </div>
                             <div class="bottom">
diff --git a/templates/zerver/footer.html b/templates/zerver/footer.html
@@ -52,7 +52,7 @@ <h3 class="footer__section-title">
                     </a>
                 </li>
                 <li>
-                    <a href="https://zulip.readthedocs.io/en/stable/production/upgrade-or-modify.html">
+                    <a href="https://zulip.readthedocs.io/en/stable/production/upgrade.html">
                         {{ _("Upgrading a Zulip server") }}
                     </a>
                 </li>
diff --git a/templates/zerver/landing_nav.html b/templates/zerver/landing_nav.html
@@ -101,7 +101,7 @@
                         <ul class="top-menu-submenu-list">
                             <li class="top-menu-submenu-list-item"><a href="/help/getting-your-organization-started-with-zulip">Setting up your organization</a></li>
                             <li class="top-menu-submenu-list-item"><a href="https://zulip.readthedocs.io/en/stable/production/install.html">Installing a Zulip server</a></li>
-                            <li class="top-menu-submenu-list-item"><a href="https://zulip.readthedocs.io/en/stable/production/upgrade-or-modify.html">Upgrading a Zulip server</a></li>
+                            <li class="top-menu-submenu-list-item"><a href="https://zulip.readthedocs.io/en/stable/production/upgrade.html">Upgrading a Zulip server</a></li>
                             <li class="top-menu-submenu-list-item"><a href="https://github.com/zulip/zulip" target="_blank" rel="noopener noreferrer">GitHub</a></li>
                         </ul>
                     </div>
@@ -227,7 +227,7 @@
                 <ul class="top-menu-submenu-list">
                     <li class="top-menu-submenu-list-item"><a href="/help/getting-your-organization-started-with-zulip">Setting up your organization</a></li>
                     <li class="top-menu-submenu-list-item"><a href="https://zulip.readthedocs.io/en/stable/production/install.html">Installing a Zulip server</a></li>
-                    <li class="top-menu-submenu-list-item"><a href="https://zulip.readthedocs.io/en/stable/production/upgrade-or-modify.html">Upgrading a Zulip server</a></li>
+                    <li class="top-menu-submenu-list-item"><a href="https://zulip.readthedocs.io/en/stable/production/upgrade.html">Upgrading a Zulip server</a></li>
                     <li class="top-menu-submenu-list-item"><a href="https://github.com/zulip/zulip" target="_blank" rel="noopener noreferrer">GitHub</a></li>
                 </ul>
             </div>
diff --git a/web/templates/gear_menu.hbs b/web/templates/gear_menu.hbs
@@ -12,7 +12,7 @@
                 </li>
                 {{#if server_needs_upgrade }}
                 <li class="org-info org-upgrade small-font-size">
-                    <a href="https://zulip.readthedocs.io/en/stable/production/upgrade-or-modify.html" target="_blank" rel="noopener noreferrer" role="menuitem">{{t 'Upgrade to the latest release' }}</a>
+                    <a href="https://zulip.readthedocs.io/en/stable/production/upgrade.html" target="_blank" rel="noopener noreferrer" role="menuitem">{{t 'Upgrade to the latest release' }}</a>
                 </li>
                 {{/if}}
             {{else}}

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ def error_desupported_os(vendor: str, os_version: str) -> NoReturn:`
`55`	`55`	`"Sorry! The support for your OS has been discontinued.\n"`
`56`	`56`	`"Please upgrade your OS to a supported release first.\n"`
`57`	`57`	`"See https://zulip.readthedocs.io/en/latest/production/"`
`58`		`- "upgrade-or-modify.html#upgrading-the-operating-system"`
	`58`	`+ "upgrade.html#upgrading-the-operating-system"`
`59`	`59`	`)`
`60`	`60`	`sys.exit(1)`
`61`	`61`