From 88873138acde0f6b66dfe09b086e5ab327be940b Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulip.com>
Date: Thu, 17 Nov 2022 15:13:58 -0800
Subject: [PATCH] Update version following 6.0 release.

---
 docs/overview/changelog.md        | 19 +++++++++++++++----
 templates/zerver/api/changelog.md |  5 +++++
 version.py                        |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/docs/overview/changelog.md b/docs/overview/changelog.md
index 5086cb76b4..8725d55716 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 6.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 all changes.
+This page the release history for the Zulip server. See also the
+[Zulip release lifecycle](../overview/release-lifecycle.md).
+
+## Zulip 7.x series
+
+### 7.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 all changes.
+
+#### Upgrade notes for 7.0
+
+- None yet.
 
 ## Zulip 6.x series
 
@@ -2939,6 +2949,7 @@ running a version from before 1.7 should upgrade directly to 1.7.1.
 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 7.0](#upgrade-notes-for-70)
 - [Upgrade notes for 6.0](#upgrade-notes-for-60)
 - [Upgrade notes for 5.0](#upgrade-notes-for-50)
 - [Upgrade notes for 4.0](#upgrade-notes-for-40)
diff --git a/templates/zerver/api/changelog.md b/templates/zerver/api/changelog.md
index 77d1ce8c4c..784d804c40 100644
--- a/templates/zerver/api/changelog.md
+++ b/templates/zerver/api/changelog.md
@@ -18,6 +18,11 @@ clients should check the `zulip_feature_level` field, present in the
 /register`](/api/register-queue) responses, to determine the API
 format used by the Zulip server that they are interacting with.
 
+## Changes in Zulip 7.0
+
+Feature levels 157-158 are reserved for future use in 6.x maintenance
+releases.
+
 ## Changes in Zulip 6.0
 
 **Feature level 156**
diff --git a/version.py b/version.py
index 07588fa332..d5e281b7aa 100644
--- a/version.py
+++ b/version.py
@@ -1,6 +1,6 @@
 import os
 
-ZULIP_VERSION = "6.0"
+ZULIP_VERSION = "7.0-dev+git"
 
 # Add information on number of commits and commit hash to version, if available
 zulip_git_version_file = os.path.join(