diff --git a/SECURITY.md b/SECURITY.md index 89866b0118..7c6bbd6657 100644 --- 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 index be8501e916..eceb87fae4 100644 --- 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 index c790c7dce3..ed052fd54d 100644 --- 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 index 3099e558da..26e1fc1bb7 100644 --- 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 index 7c8d137fe0..b8fc6204fd 100644 --- 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 index 24ae49ae57..4067677a03 100755 --- 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 index 2a54153d16..dabe3a5cb2 100755 --- 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 index 74d83f2ee0..99257a300f 100644 --- a/templates/corporate/for/business.html +++ b/templates/corporate/for/business.html @@ -449,7 +449,7 @@ Zulip Cloud is built with privacy and security in mind, and is used by some of the most security-conscious organizations in the world. -
  • Zulip is 100% open-source software, with no "open core" catch. We work hard to make it easy to set up, back up, and maintain a self-hosted Zulip installation, where you have full control of your data.
    • +
  • Zulip is 100% open-source software, with no "open core" catch. We work hard to make it easy to set up, back up, and maintain a self-hosted Zulip installation, where you have full control of your data.
  • Move your data with our high quality export and import tools; you are never locked into a proprietary tool.
  • Zulip is built for scale and works reliably for organizations with thousands of users online at once with modest hardware.
  • diff --git a/templates/corporate/for/open-source.html b/templates/corporate/for/open-source.html index 1a774c6e6e..9b3f8afd62 100644 --- a/templates/corporate/for/open-source.html +++ b/templates/corporate/for/open-source.html @@ -268,7 +268,7 @@ open-source software, with no "open core" catch. We work hard to make it easy to set up, backup, - and maintain + and maintain a self-hosted Zulip installation, where you have full control of your data. diff --git a/templates/corporate/pricing_model.html b/templates/corporate/pricing_model.html index 184b04d94f..75ac8c0eb7 100644 --- a/templates/corporate/pricing_model.html +++ b/templates/corporate/pricing_model.html @@ -124,7 +124,7 @@
  • LDAP/Active Directory sync
  • Advanced roles and permissions
  • Easy installation - and maintenance
    • + and maintenance
    diff --git a/templates/corporate/self-hosting.html b/templates/corporate/self-hosting.html index 9685e76208..4463c2bdf5 100644 --- a/templates/corporate/self-hosting.html +++ b/templates/corporate/self-hosting.html @@ -144,7 +144,7 @@ Our well-documented scripts help you setup, backup, and - upgrade + upgrade your self-hosted Zulip installation. Migrate your data and integrations @@ -242,7 +242,7 @@

    Zulip makes it easy to - + maintain a fork with customized features, with 175,000 words of documentation for system administrators and developers.

    @@ -292,7 +292,7 @@
  • LDAP/Active Directory sync
  • Advanced roles and permissions
  • Easy installation - and maintenance
    • + and maintenance
    diff --git a/templates/zerver/footer.html b/templates/zerver/footer.html index ede95f8101..1d703c4d2c 100644 --- a/templates/zerver/footer.html +++ b/templates/zerver/footer.html @@ -52,7 +52,7 @@
  • - + {{ _("Upgrading a Zulip server") }}
    • diff --git a/templates/zerver/landing_nav.html b/templates/zerver/landing_nav.html index 4b9184b287..ce3ae31643 100644 --- a/templates/zerver/landing_nav.html +++ b/templates/zerver/landing_nav.html @@ -101,7 +101,7 @@
    @@ -227,7 +227,7 @@ diff --git a/web/templates/gear_menu.hbs b/web/templates/gear_menu.hbs index cb99e56b12..db725b90a8 100644 --- a/web/templates/gear_menu.hbs +++ b/web/templates/gear_menu.hbs @@ -12,7 +12,7 @@ {{#if server_needs_upgrade }}
  • - {{t 'Upgrade to the latest release' }} + {{t 'Upgrade to the latest release' }}
    • {{/if}} {{else}}