this branch is now 3.10

.github/workflows/main.yml

@@ -6,6 +6,7 @@ on:
     branches:
       - master
       - main
+      - cyrus-imapd-3.10
       - cyrus-imapd-3.8
       - cyrus-imapd-3.6
       - cyrus-imapd-3.4

README.md

@@ -1,17 +1,15 @@
 <sup>master: </sup>[![Build Status:master](https://github.com/cyrusimap/cyrus-imapd/actions/workflows/main.yml/badge.svg)](https://github.com/cyrusimap/cyrus-imapd/actions/workflows/main.yml)
-<sup> stable(3.6): </sup>[![Build Status:3.6](https://github.com/cyrusimap/cyrus-imapd/actions/workflows/main.yml/badge.svg?branch=cyrus-imapd-3.6)](https://github.com/cyrusimap/cyrus-imapd/actions/workflows/main.yml)
+<sup> stable(3.10): </sup>[![Build Status:3.10](https://github.com/cyrusimap/cyrus-imapd/actions/workflows/main.yml/badge.svg?branch=cyrus-imapd-3.10)](https://github.com/cyrusimap/cyrus-imapd/actions/workflows/main.yml)
 
 -----
 
 Welcome
 =======
 
-This is the Cyrus IMAP Server, developer version 3.9.  This version is under
-active development, and is not considered "stable".
+This is the Cyrus IMAP Server, stable version 3.10.
 
-The current stable series is 3.8.
 
-Versions 3.0 to 3.6 still receive security updates, and some non-security
+Versions 3.2 to 3.8 still receive security updates, and some non-security
 bug fixes.
 
 What is Cyrus
@@ -93,7 +91,7 @@ from source (see next section).
 The latest development code is on the branch called 'master',
 and the latest code destined for the stable release is on
 the branch 'cyrus-imapd-$major.$minor'.  So the current
-stable release is called cyrus-imapd-3.8
+stable release is called cyrus-imapd-3.10
 
 Unlike releases, the git repository doesn't have a pre-built
 ./configure script.  You need to generate it with autoreconf:

docsrc/conf.py

@@ -55,7 +55,7 @@
 extensions.append('sphinxlocal.sitemap')
 
 # We publish master branch at /dev
-# Other branches are available at multiple locations (3.6 is at 3.6 and stable and /).
+# Other branches are available at multiple locations (3.10 is at 3.10 and stable and /).
 # Supply all webroots that this set of docs is available at.
 sitemap_website = ["https://www.cyrusimap.org/dev/"]
 
@@ -98,9 +98,9 @@
 # May need to also update toplevel index.rst to point to other versions.
 #
 # The short X.Y version.
-version = '3.9.0'
+version = '3.10.0'
 # The full version, including alpha/beta/rc tags.
-release = '3.9.0-alpha0 (dev)'
+release = '3.10.0-alpha0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -163,7 +163,7 @@
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-html_theme_options = { 'github_version': 'master'}
+html_theme_options = { 'github_version': 'cyrus-imapd-3.10'}
 
 
 # Add any paths that contain custom themes here, relative to this directory.
@@ -431,11 +431,11 @@
 # When this is updated, you may also need to update the version and release
 # definitions listed above to stay up to date.
 rst_prolog = """
-.. |imap_last_stable_version| replace:: 3.6.3
-.. |imap_last_stable_branch| replace:: `cyrus-imapd-3.6`
-.. |imap_current_stable_version| replace:: 3.8.1
-.. |imap_current_stable_branch| replace:: `cyrus-imapd-3.8`
-.. |imap_latest_development_version| replace:: 3.9.0-alpha0
+.. |imap_last_stable_version| replace:: 3.8.1
+.. |imap_last_stable_branch| replace:: `cyrus-imapd-3.8`
+.. |imap_current_stable_version| replace:: 3.10.0-alpha0
+.. |imap_current_stable_branch| replace:: `cyrus-imapd-3.10`
+.. |imap_latest_development_version| replace:: 3.11.0-alpha0
 .. |imap_latest_development_branch| replace:: master
 .. |imap_tikanga_stock_version| replace:: 2.3.7
 .. |imap_santiago_stock_version| replace:: 2.3.16
@@ -448,11 +448,11 @@
 .. |sasl_current_stable_version| replace:: 2.1.28
 .. |imap_stable_release_notes| raw:: html
 
-    <a href="3.8/x/3.8.1.html">3.8.1</a>
+    <a href="3.10/x/3.10.0-alpha0.html">3.10.0-alpha0</a>
 
 .. |imap_development_release_notes| raw:: html
 
-    <a href="https://www.cyrusimap.org/dev/imap/download/release-notes/3.9/x/3.9.0-alpha0.html">3.9.0-alpha0</a>
+    <a href="https://www.cyrusimap.org/dev/imap/download/release-notes/3.11/x/3.11.0-alpha0.html">3.11.0-alpha0</a>
 
 """
 
@@ -535,6 +535,7 @@
         'cyrus-3.4':('https://www.cyrusimap.org/3.4%s',None),
         'cyrus-3.6':('https://www.cyrusimap.org/3.6%s',None),
         'cyrus-3.8':('https://www.cyrusimap.org/3.8%s',None),
+        'cyrus-3.10':('https://www.cyrusimap.org/3.10%s',None),
         'cyrus-dev':('https://www.cyrusimap.org/dev%s',None),
         'cyrus-stable': ('https://www.cyrusimap.org%s',None),
         'github-release':

docsrc/imap/download/release-notes/3.10/index.rst

@@ -0,0 +1,15 @@
+.. _imap-release-notes-3.10:
+
+========================
+Cyrus IMAP 3.10 Releases
+========================
+
+.. toctree::
+    :maxdepth: 1
+    :glob:
+
+    x/?.?.*-alpha*
+    x/?.?.*-beta*
+    x/?.?.*-rc*
+    x/?.?.?
+    x/?.?.??

docsrc/imap/download/release-notes/3.10/x/3.10.0-alpha0.rst

@@ -0,0 +1,48 @@
+:tocdepth: 3
+
+===============================
+Cyrus IMAP 3.10.0 Release Notes
+===============================
+
+Download from GitHub:
+
+    *   https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.10.0/cyrus-imapd-3.10.0.tar.gz
+    *   https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.10.0/cyrus-imapd-3.10.0.tar.gz.sig
+
+.. _relnotes-3.10.0_changes:
+
+Major changes since the 3.8 series
+==================================
+
+* None so far
+
+.. _relnotes_3.10.0-alpha0_storage_changes:
+
+Storage changes
+===============
+
+* None in 3.10.  But if your upgrade is skipping over 3.6 and 3.8, please do
+  not miss :ref:`3.6.0 Storage changes <relnotes_3.6.0_storage_changes>`
+  and :ref:`3.8.0 Storage changes <relnotes_3.8.0_storage_changes>`
+
+Updates to default configuration
+================================
+
+The :cyrusman:`cyr_info(8)` `conf`, `conf-all` and `conf-default` subcommands
+accept an `-s <version>` argument to highlight :cyrusman:`imapd.conf(5)`
+options that are new or whose behaviour has changed since the specified
+version.  We recommend using this when evaluating a new Cyrus version to
+check which configuration options you will need to examine and maybe set or
+change during the process.
+
+* None so far
+
+Security fixes
+==============
+
+* None so far
+
+Significant bugfixes
+====================
+
+* None so far

docsrc/imap/download/release-notes/3.11/index.rst

@@ -0,0 +1,21 @@
+.. _imap-release-notes-3.11:
+
+====================
+Cyrus IMAP 3.11 Tags
+====================
+
+.. warning::
+
+    The 3.11 series are tagged snapshots of the master branch, and should be
+    considered for **testing purposes** and **bleeding-edge features** only.
+    We will try to tag these snapshots at coherent development points, but
+    there will generally be **large breaking changes** occurring between
+    releases in this series.
+
+.. toctree::
+    :maxdepth: 1
+    :glob:
+
+    x/?.?.?-alpha*
+    x/?.?.?
+    x/?.?.??

docsrc/imap/download/release-notes/index.rst

@@ -31,6 +31,16 @@ Latest development snapshot is |imap_development_release_notes|. Documentation a
 Supported Product Series
 ========================
 
+Series 3.10
+-----------
+
+Documentation at :cyrus-3.10:`/`.
+
+.. toctree::
+    :maxdepth: 1
+
+    3.10/index
+
 Series 3.8
 ----------
 

docsrc/index.rst

@@ -7,8 +7,9 @@ What is Cyrus IMAP?
 Cyrus IMAP is an email, contacts and calendar server. Cyrus is free and open source.
 
 
-* This is version |imap_latest_development_version|: **development** branch.
-* The latest stable version |imap_current_stable_version| is at :cyrus-stable:`/`.
+* This is the documentation for version |release| of Cyrus IMAP: **stable** br>
+* The latest development version |imap_latest_development_version| is at :cyru>
+
 
 .. Update this when there is a changeover from stable to development.