From bcc760a3fb645b405d3db1bb44e44613043ba912 Mon Sep 17 00:00:00 2001 From: architeuthis Date: Thu, 27 Jun 2024 11:33:32 +0800 Subject: [PATCH] doc: Add description of release model to manual --- RELEASE_NOTES.rst | 2 +- doc/manual/release_notes.rst | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst index c1c7a4c57..e3bab5ca1 100644 --- a/RELEASE_NOTES.rst +++ b/RELEASE_NOTES.rst @@ -9,7 +9,7 @@ ARTIQ-9 (Unreleased) * Zadig Driver Installer was added to the MSYS2 offline installer. ARTIQ-8 --------------------- +------- Highlights: diff --git a/doc/manual/release_notes.rst b/doc/manual/release_notes.rst index 764448b9c..dd0d94b08 100644 --- a/doc/manual/release_notes.rst +++ b/doc/manual/release_notes.rst @@ -1 +1,10 @@ +ARTIQ Releases +============== + +ARTIQ follows a rolling release model, with beta, stable, and legacy channels. Different releases are saved as different branches on the M-Labs `ARTIQ repository `_. The ``master`` branch represents the beta version, where at any time the next stable release of ARTIQ is currently in development. This branch is unstable and does not yet guarantee reliability or consistency, but may also already offer new features and improvements; see the `beta release notes `_ for the most up-to-date information. The ``release-[number]`` branches represent stable releases, of which the most recent is considered the current stable version, and the second-most recent the current legacy version. + +To install the current stable version of ARTIQ, consult the *current* `Installing ARTIQ `_ page. To install beta or legacy versions, consult the same page in their respective manuals. Instructions given in pre-legacy versions of the manual may or may not install their corresponding ARTIQ systems, and may or may not currently be supported (e.g. M-Labs does not host older ARTIQ versions for Conda, and Conda support will probably eventually be removed entirely). Regardless, all out-of-date versions remain available as complete source code on the repository. + +The beta manual is hosted `here `_. The current manual is hosted `here `_. The legacy manual is hosted `here `_. Older versions of the manual can be rebuilt from the source files in ``doc/manual``, retrieved from the respective branch. + .. include:: ../../RELEASE_NOTES.rst