Skip to content

Commit 2a43510

Browse files
elliefmelliefm
committed
this branch is now 3.10
1 parent c78ab7b commit 2a43510

File tree

8 files changed

+114
-19
lines changed

8 files changed

+114
-19
lines changed

Diff for: ‎.github/workflows/main.yml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
branches:
77
- master
88
- main
9+
- cyrus-imapd-3.10
910
- cyrus-imapd-3.8
1011
- cyrus-imapd-3.6
1112
- cyrus-imapd-3.4

Diff for: ‎README.md

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<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)
2-
<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)
2+
<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)
33

44
-----
55

66
Welcome
77
=======
88

9-
This is the Cyrus IMAP Server, developer version 3.9. This version is under
10-
active development, and is not considered "stable".
9+
This is the Cyrus IMAP Server, stable version 3.10.
1110

12-
The current stable series is 3.8.
1311

14-
Versions 3.0 to 3.6 still receive security updates, and some non-security
12+
Versions 3.2 to 3.8 still receive security updates, and some non-security
1513
bug fixes.
1614

1715
What is Cyrus
@@ -93,7 +91,7 @@ from source (see next section).
9391
The latest development code is on the branch called 'master',
9492
and the latest code destined for the stable release is on
9593
the branch 'cyrus-imapd-$major.$minor'. So the current
96-
stable release is called cyrus-imapd-3.8
94+
stable release is called cyrus-imapd-3.10
9795

9896
Unlike releases, the git repository doesn't have a pre-built
9997
./configure script. You need to generate it with autoreconf:

Diff for: ‎docsrc/conf.py

+12-11
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
extensions.append('sphinxlocal.sitemap')
5656

5757
# We publish master branch at /dev
58-
# Other branches are available at multiple locations (3.6 is at 3.6 and stable and /).
58+
# Other branches are available at multiple locations (3.10 is at 3.10 and stable and /).
5959
# Supply all webroots that this set of docs is available at.
6060
sitemap_website = ["https://www.cyrusimap.org/dev/"]
6161

@@ -98,9 +98,9 @@
9898
# May need to also update toplevel index.rst to point to other versions.
9999
#
100100
# The short X.Y version.
101-
version = '3.9.0'
101+
version = '3.10.0'
102102
# The full version, including alpha/beta/rc tags.
103-
release = '3.9.0-alpha0 (dev)'
103+
release = '3.10.0-alpha0'
104104

105105
# The language for content autogenerated by Sphinx. Refer to documentation
106106
# for a list of supported languages.
@@ -163,7 +163,7 @@
163163
# Theme options are theme-specific and customize the look and feel of a theme
164164
# further. For a list of options available for each theme, see the
165165
# documentation.
166-
html_theme_options = { 'github_version': 'master'}
166+
html_theme_options = { 'github_version': 'cyrus-imapd-3.10'}
167167

168168

169169
# Add any paths that contain custom themes here, relative to this directory.
@@ -431,11 +431,11 @@
431431
# When this is updated, you may also need to update the version and release
432432
# definitions listed above to stay up to date.
433433
rst_prolog = """
434-
.. |imap_last_stable_version| replace:: 3.6.3
435-
.. |imap_last_stable_branch| replace:: `cyrus-imapd-3.6`
436-
.. |imap_current_stable_version| replace:: 3.8.1
437-
.. |imap_current_stable_branch| replace:: `cyrus-imapd-3.8`
438-
.. |imap_latest_development_version| replace:: 3.9.0-alpha0
434+
.. |imap_last_stable_version| replace:: 3.8.1
435+
.. |imap_last_stable_branch| replace:: `cyrus-imapd-3.8`
436+
.. |imap_current_stable_version| replace:: 3.10.0-alpha0
437+
.. |imap_current_stable_branch| replace:: `cyrus-imapd-3.10`
438+
.. |imap_latest_development_version| replace:: 3.11.0-alpha0
439439
.. |imap_latest_development_branch| replace:: master
440440
.. |imap_tikanga_stock_version| replace:: 2.3.7
441441
.. |imap_santiago_stock_version| replace:: 2.3.16
@@ -448,11 +448,11 @@
448448
.. |sasl_current_stable_version| replace:: 2.1.28
449449
.. |imap_stable_release_notes| raw:: html
450450
451-
<a href="3.8/x/3.8.1.html">3.8.1</a>
451+
<a href="3.10/x/3.10.0-alpha0.html">3.10.0-alpha0</a>
452452
453453
.. |imap_development_release_notes| raw:: html
454454
455-
<a href="https://www.cyrusimap.org/dev/imap/download/release-notes/3.9/x/3.9.0-alpha0.html">3.9.0-alpha0</a>
455+
<a href="https://www.cyrusimap.org/dev/imap/download/release-notes/3.11/x/3.11.0-alpha0.html">3.11.0-alpha0</a>
456456
457457
"""
458458

@@ -535,6 +535,7 @@
535535
'cyrus-3.4':('https://www.cyrusimap.org/3.4%s',None),
536536
'cyrus-3.6':('https://www.cyrusimap.org/3.6%s',None),
537537
'cyrus-3.8':('https://www.cyrusimap.org/3.8%s',None),
538+
'cyrus-3.10':('https://www.cyrusimap.org/3.10%s',None),
538539
'cyrus-dev':('https://www.cyrusimap.org/dev%s',None),
539540
'cyrus-stable': ('https://www.cyrusimap.org%s',None),
540541
'github-release':

Diff for: ‎docsrc/imap/download/release-notes/3.10/index.rst

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
.. _imap-release-notes-3.10:
2+
3+
========================
4+
Cyrus IMAP 3.10 Releases
5+
========================
6+
7+
.. toctree::
8+
:maxdepth: 1
9+
:glob:
10+
11+
x/?.?.*-alpha*
12+
x/?.?.*-beta*
13+
x/?.?.*-rc*
14+
x/?.?.?
15+
x/?.?.??

Diff for: ‎docsrc/imap/download/release-notes/3.10/x/3.10.0-alpha0.rst

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
:tocdepth: 3
2+
3+
===============================
4+
Cyrus IMAP 3.10.0 Release Notes
5+
===============================
6+
7+
Download from GitHub:
8+
9+
* https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.10.0/cyrus-imapd-3.10.0.tar.gz
10+
* https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.10.0/cyrus-imapd-3.10.0.tar.gz.sig
11+
12+
.. _relnotes-3.10.0_changes:
13+
14+
Major changes since the 3.8 series
15+
==================================
16+
17+
* None so far
18+
19+
.. _relnotes_3.10.0-alpha0_storage_changes:
20+
21+
Storage changes
22+
===============
23+
24+
* None in 3.10. But if your upgrade is skipping over 3.6 and 3.8, please do
25+
not miss :ref:`3.6.0 Storage changes <relnotes_3.6.0_storage_changes>`
26+
and :ref:`3.8.0 Storage changes <relnotes_3.8.0_storage_changes>`
27+
28+
Updates to default configuration
29+
================================
30+
31+
The :cyrusman:`cyr_info(8)` `conf`, `conf-all` and `conf-default` subcommands
32+
accept an `-s <version>` argument to highlight :cyrusman:`imapd.conf(5)`
33+
options that are new or whose behaviour has changed since the specified
34+
version. We recommend using this when evaluating a new Cyrus version to
35+
check which configuration options you will need to examine and maybe set or
36+
change during the process.
37+
38+
* None so far
39+
40+
Security fixes
41+
==============
42+
43+
* None so far
44+
45+
Significant bugfixes
46+
====================
47+
48+
* None so far

Diff for: ‎docsrc/imap/download/release-notes/3.11/index.rst

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
.. _imap-release-notes-3.11:
2+
3+
====================
4+
Cyrus IMAP 3.11 Tags
5+
====================
6+
7+
.. warning::
8+
9+
The 3.11 series are tagged snapshots of the master branch, and should be
10+
considered for **testing purposes** and **bleeding-edge features** only.
11+
We will try to tag these snapshots at coherent development points, but
12+
there will generally be **large breaking changes** occurring between
13+
releases in this series.
14+
15+
.. toctree::
16+
:maxdepth: 1
17+
:glob:
18+
19+
x/?.?.?-alpha*
20+
x/?.?.?
21+
x/?.?.??

Diff for: ‎docsrc/imap/download/release-notes/index.rst

+10
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,16 @@ Latest development snapshot is |imap_development_release_notes|. Documentation a
3131
Supported Product Series
3232
========================
3333

34+
Series 3.10
35+
-----------
36+
37+
Documentation at :cyrus-3.10:`/`.
38+
39+
.. toctree::
40+
:maxdepth: 1
41+
42+
3.10/index
43+
3444
Series 3.8
3545
----------
3646

Diff for: ‎docsrc/index.rst

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ What is Cyrus IMAP?
77
Cyrus IMAP is an email, contacts and calendar server. Cyrus is free and open source.
88

99

10-
* This is version |imap_latest_development_version|: **development** branch.
11-
* The latest stable version |imap_current_stable_version| is at :cyrus-stable:`/`.
10+
* This is the documentation for version |release| of Cyrus IMAP: **stable** br>
11+
* The latest development version |imap_latest_development_version| is at :cyru>
12+
1213

1314
.. Update this when there is a changeover from stable to development.
1415

0 commit comments

Comments
 (0)