Merge remote-tracking branch 'origin/main' into pr-1325

This commit is contained in:
Andrew David Wong 2023-06-02 23:23:02 -07:00
commit a81ee2c219
No known key found for this signature in database
GPG key ID: 8CE137352A019A17
2 changed files with 5 additions and 7 deletions

View file

@ -91,8 +91,8 @@ are released, in hope that they will be installed by wider user base and
tested. tested.
The next RC is released five weeks after the former. All packets are published 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 in `current` repository and the cycle starts over. There should always be at
1 and no more than 3 release candidates before final release. least one release candidate before the final release.
| Stage | Duration | | Stage | Duration |
| ------------------------ | --------- | | ------------------------ | --------- |

View file

@ -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) 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 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 obtain the correct RSK. The filename pattern for RSKs is
usually `qubes-release-X-signing-key.asc`, where `X` is the [major version `qubes-release-X-signing-key.asc`, where `X` is either a major or minor Qubes
number](https://semver.org/) of your Qubes release. For example, if you were release number, such as `4` or `4.2`. There are several ways to get the RSK for
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
your Qubes release. your Qubes release.
- If you have access to an existing Qubes installation, the release keys are - If you have access to an existing Qubes installation, the release keys are