diff options
Diffstat (limited to 'docs/breaking_changes.md')
| -rw-r--r-- | docs/breaking_changes.md | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md index 919c443123..e660182c32 100644 --- a/docs/breaking_changes.md +++ b/docs/breaking_changes.md | |||
| @@ -10,27 +10,25 @@ Practically, this means QMK merges the `develop` branch into the `master` branch | |||
| 10 | 10 | ||
| 11 | ## What has been included in past Breaking Changes? | 11 | ## What has been included in past Breaking Changes? |
| 12 | 12 | ||
| 13 | * [2023 May 28](ChangeLog/20230528.md) | ||
| 13 | * [2023 Feb 26](ChangeLog/20230226.md) | 14 | * [2023 Feb 26](ChangeLog/20230226.md) |
| 14 | * [2022 Nov 26](ChangeLog/20221126.md) | 15 | * [2022 Nov 26](ChangeLog/20221126.md) |
| 15 | * [2022 Aug 27](ChangeLog/20220827.md) | ||
| 16 | * [2022 May 28](ChangeLog/20220528.md) | ||
| 17 | * [2022 Feb 26](ChangeLog/20220226.md) | ||
| 18 | * [Older Breaking Changes](breaking_changes_history.md) | 16 | * [Older Breaking Changes](breaking_changes_history.md) |
| 19 | 17 | ||
| 20 | ## When is the next Breaking Change? | 18 | ## When is the next Breaking Change? |
| 21 | 19 | ||
| 22 | The next Breaking Change is scheduled for May 28, 2023. | 20 | The next Breaking Change is scheduled for August 27, 2023. |
| 23 | 21 | ||
| 24 | ### Important Dates | 22 | ### Important Dates |
| 25 | 23 | ||
| 26 | * 2023 Feb 26 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions. | 24 | * 2023 May 28 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions. |
| 27 | * 2023 Apr 30 - `develop` closed to new PRs. | 25 | * 2023 Jul 30 - `develop` closed to new PRs. |
| 28 | * 2023 Apr 30 - Call for testers. | 26 | * 2023 Jul 30 - Call for testers. |
| 29 | * 2023 May 14 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes | 27 | * 2023 Aug 13 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes |
| 30 | * 2023 May 21 - `develop` is locked, only critical bugfix PRs merged. | 28 | * 2023 Aug 20 - `develop` is locked, only critical bugfix PRs merged. |
| 31 | * 2023 May 26 - `master` is locked, no PRs merged. | 29 | * 2023 Aug 25 - `master` is locked, no PRs merged. |
| 32 | * 2023 May 28 - Merge `develop` to `master`. | 30 | * 2023 Aug 27 - Merge `develop` to `master`. |
| 33 | * 2023 May 28 - `master` is unlocked. PRs can be merged again. | 31 | * 2023 Aug 27 - `master` is unlocked. PRs can be merged again. |
| 34 | 32 | ||
| 35 | ## What changes will be included? | 33 | ## What changes will be included? |
| 36 | 34 | ||
| @@ -50,7 +48,7 @@ Criteria for acceptance: | |||
| 50 | 48 | ||
| 51 | Strongly suggested: | 49 | Strongly suggested: |
| 52 | 50 | ||
| 53 | * The PR has a ChangeLog file describing the changes under `<qmk_firmware>/docs/Changelog/20221126`. | 51 | * The PR has a ChangeLog file describing the changes under `<qmk_firmware>/docs/Changelog/20230827`. |
| 54 | * This should be in Markdown format, with a name in the format `PR12345.md`, substituting the digits for your PRs ID. | 52 | * This should be in Markdown format, with a name in the format `PR12345.md`, substituting the digits for your PRs ID. |
| 55 | * One strong recommendation that the ChangeLog document matches the PR description on GitHub, so as to ensure traceability. | 53 | * One strong recommendation that the ChangeLog document matches the PR description on GitHub, so as to ensure traceability. |
| 56 | 54 | ||
