From 1dd7fc0ceb16e76fe097325de3fd67ed565c6a77 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Wed, 31 May 2023 06:03:31 -0700 Subject: [PATCH 1/3] Drop "no more than 3 RCs" clause See @marmarek's comment: https://github.com/QubesOS/qubes-posts/pull/114#discussion_r1211650523 --- developer/releases/version-scheme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/developer/releases/version-scheme.md b/developer/releases/version-scheme.md index a530947c..ad339891 100644 --- a/developer/releases/version-scheme.md +++ b/developer/releases/version-scheme.md @@ -91,8 +91,8 @@ are released, in hope that they will be installed by wider user base and tested. The next RC is released five weeks after the former. All packets are published -in `current` repository and the cycle starts over. There should be no less than -1 and no more than 3 release candidates before final release. +in `current` repository and the cycle starts over. There should always be at +least one release candidate before final release. | Stage | Duration | | ------------------------ | --------- | From 1376696941c2e378a973fb54820214f7e0876102 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Wed, 31 May 2023 06:07:16 -0700 Subject: [PATCH 2/3] Fix typo --- developer/releases/version-scheme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/developer/releases/version-scheme.md b/developer/releases/version-scheme.md index ad339891..6f503f37 100644 --- a/developer/releases/version-scheme.md +++ b/developer/releases/version-scheme.md @@ -92,7 +92,7 @@ tested. The next RC is released five weeks after the former. All packets are published in `current` repository and the cycle starts over. There should always be at -least one release candidate before final release. +least one release candidate before the final release. | Stage | Duration | | ------------------------ | --------- | From a6fedbdd8ae27082c78bbc2827b76cbcd155ecd6 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Fri, 2 Jun 2023 17:59:35 -0700 Subject: [PATCH 3/3] Update RSK description to account for minor release keys --- project-security/verifying-signatures.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/project-security/verifying-signatures.md b/project-security/verifying-signatures.md index faa27ea7..9a2df42c 100644 --- a/project-security/verifying-signatures.md +++ b/project-security/verifying-signatures.md @@ -294,11 +294,9 @@ Before we proceed, you must first complete the following prerequisite steps: 2. [Import and authenticate the QMSK.](#how-to-import-and-authenticate-the-qubes-master-signing-key) After you have completed these two prerequisite steps, the next step is to -obtain the correct RSK. The filename of the RSK for your Qubes OS release is -usually `qubes-release-X-signing-key.asc`, where `X` is the [major version -number](https://semver.org/) of your Qubes release. For example, if you were -installing release `1.2.3`, you would replace `X` with `1`, resulting in -`qubes-release-1-signing-key.asc`. There are several ways to get the RSK for +obtain the correct RSK. The filename pattern for RSKs is +`qubes-release-X-signing-key.asc`, where `X` is either a major or minor Qubes +release number, such as `4` or `4.2`. There are several ways to get the RSK for your Qubes release. - If you have access to an existing Qubes installation, the release keys are