From b82fb6ac7d3f7b724bf3eff56f77978308b3b510 Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Sat, 6 Sep 2025 15:55:19 +0200 Subject: [PATCH] Diviner: Correct "Upgrading Phorge" article on release phrequency Summary: In reality, we do not release weekly, and we do not really cherry-pick from master to the stable branch. Test Plan: Analyze our activities; run `./bin/diviner generate`. Reviewers: O1 Blessed Committers, mainframe98 Reviewed By: O1 Blessed Committers, mainframe98 Subscribers: tobiaswiese, valerio.bozzolan, Matthew, Cigaryno Differential Revision: https://we.phorge.it/D26325 --- src/docs/user/upgrading.diviner | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/docs/user/upgrading.diviner b/src/docs/user/upgrading.diviner index e6ac462bff..38976a09a9 100644 --- a/src/docs/user/upgrading.diviner +++ b/src/docs/user/upgrading.diviner @@ -6,10 +6,10 @@ This document contains instructions for keeping Phorge up to date. Overview ======== -Phorge is under active development, and new features are released -continuously. Staying up to date will keep your install secure. +Phorge is under active development, and releases are published regularly. +Staying up to date will keep your install secure. -We recommend installs upgrade regularly (every 1-2 weeks). Upgrades usually go +We recommend installs upgrade regularly. Upgrades usually go smoothly and complete in a few minutes. If you put off upgrades for a long time, it may take a lot more work to bring things up to date if you want access to a useful new feature or an important security change. @@ -31,10 +31,7 @@ You can either run the `master` or `stable` branch of Phorge. The `stable` branch is a little more stable than `master`, and may be helpful if you administrate a larger install. -We promote `master` to `stable` frequently, then publish the changelog. During -the week, major bugfixes are cherry-picked to the `stable` branch. The changelog - lists the `stable` hashes for that week, as well as any fixes which were - cherry-picked. +We promote `master` to `stable` regularly, then publish the changelog. To switch to `stable`, check the branch out in each working copy: -- 2.51.2