Skip to content

Commit 12e8f0f

Browse files
committed
version: Update version following 5.0 release.
1 parent d308c69 commit 12e8f0f

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

docs/overview/changelog.md

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
# Version history
22

3-
This page contains the release history for the Zulip 5.x stable
4-
release series. See the [current Zulip changelog][latest-changelog]
5-
for newer release series, or the [commit log][commit-log] for an
6-
up-to-date list of raw changes.
3+
This page the release history for the Zulip server. See also the
4+
[Zulip release lifecycle](../overview/release-lifecycle.md).
5+
6+
## Zulip 6.x series
7+
8+
### 6.0 -- unreleased
9+
10+
This section is an incomplete draft of the release notes for the next
11+
major release, and is only updated occasionally. See the [commit
12+
log][commit-log] for an up-to-date list of raw changes.
13+
14+
#### Upgrade notes for 6.0
15+
16+
- None yet.
717

818
## Zulip 5.x series
919

@@ -2580,6 +2590,7 @@ running a version from before 1.7 should upgrade directly to 1.7.1.
25802590
This section links to the upgrade notes from past releases, so you can
25812591
easily read them all when upgrading across multiple releases.
25822592

2593+
* [Draft upgrade notes for 6.0](#upgrade-notes-for-6-0)
25832594
- [Upgrade notes for 5.0](#upgrade-notes-for-50)
25842595
- [Upgrade notes for 4.0](#upgrade-notes-for-40)
25852596
- [Upgrade notes for 3.0](#upgrade-notes-for-30)

templates/zerver/api/changelog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ clients should check the `zulip_feature_level` field, present in the
1818
/register`](/api/register-queue) responses, to determine the API
1919
format used by the Zulip server that they are interacting with.
2020

21+
## Changes in Zulip 6.0
22+
23+
Feature levels 123-124 are reserved for future use in 5.x maintenance
24+
releases.
25+
2126
## Changes in Zulip 5.0
2227

2328
**Feature level 122**

version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import os
22

3-
ZULIP_VERSION = "5.0"
3+
ZULIP_VERSION = "6.0-dev+git"
44

55
# Add information on number of commits and commit hash to version, if available
66
zulip_git_version_file = os.path.join(

0 commit comments

Comments
 (0)