diff --git a/docs/overview/changelog.md b/docs/overview/changelog.md index d6afa7784e..fd9c9ff0ec 100644 --- a/docs/overview/changelog.md +++ b/docs/overview/changelog.md @@ -1,9 +1,19 @@ # Version history -This page contains the release history for the Zulip 4.x stable -release series. See the [current Zulip changelog][latest-changelog] -for newer release series, or the [commit log][commit-log] for an -up-to-date list of raw changes. +This page the release history for the Zulip server. See also the +[Zulip release lifecycle](../overview/release-lifecycle.md). + +## Zulip 5.x series + +### 5.0 -- unreleased + +This section is an incomplete draft of the release notes for the next +major release, and is only updated occasionally. See the [commit +log][commit-log] for an up-to-date list of raw changes. + +#### Upgrade notes for 5.0 + +- None yet. ## Zulip 4.x series @@ -2117,6 +2127,7 @@ Zulip apps. This section links to the upgrade notes from past releases, so you can easily read them all when upgrading across multiple releases. +* [Draft upgrade notes for 5.0](#upgrade-notes-for-5-0) * [Upgrade notes for 4.0](#upgrade-notes-for-4-0) * [Upgrade notes for 3.0](#upgrade-notes-for-3-0) * [Upgrade notes for 2.1.5](#upgrade-notes-for-2-1-5) diff --git a/templates/zerver/api/changelog.md b/templates/zerver/api/changelog.md index cd5a28f41b..76079695fb 100644 --- a/templates/zerver/api/changelog.md +++ b/templates/zerver/api/changelog.md @@ -9,6 +9,11 @@ server versions is to check the `zulip_feature_level` parameter in the `/register` and `/server_settings` responses to determine which of the below features are supported. +## Changes in Zulip 5.0 + +Feature levels 66-69 are reserved for future use in 4.x maintenance +releases. + ## Changes in Zulip 4.0 **Feature level 65** diff --git a/version.py b/version.py index 7c3aee9ba8..bca669d97b 100644 --- a/version.py +++ b/version.py @@ -1,6 +1,6 @@ import os -ZULIP_VERSION = "4.0" +ZULIP_VERSION = "5.0-dev+git" # Add information on number of commits and commit hash to version, if available zulip_git_version_file = os.path.join(