Merge pull request #1429 from publiccodenet/release-20240111

Release 20240111

activities/documentation/index.md

@@ -17,7 +17,7 @@ In order to always be able to access the most up to date information as well as
 About is the canonical source of truth for our organization.
 This means that the information on the [about.publiccode.net](https://about.publiccode.net/) website – a reflection of the `main` branch in the [`about` repository](https://github.com/publiccodenet/about) – takes precedence over any other information.
 
-We work according to [GitHub flow](https://docs.github.com/en/get-started/quickstart/github-flow), except for work that is versioned and deployed, in which case we use [a GitFlow branching model](https://datasift.github.io/gitflow/IntroducingGitFlow.html).
+We work according to [GitHub flow](https://docs.github.com/en/get-started/quickstart/github-flow), except for work that is versioned and deployed, in which case we use [a GitFlow branching model](https://web.archive.org/web/20231229171831/https://datasift.github.io/gitflow/IntroducingGitFlow.html).
 
 ## Content types
 

activities/documentation/merge-develop-into-main.md

@@ -23,7 +23,7 @@ The purpose of reviewing these merges carefully is to make sure that we only pub
 5. Once review is complete, merge to main! :tada:
 6. If any changes were made to the release branch, make a pull request from main into develop. This ensures these changes will also be implemented in develop, keeping it up to date.
 
-Our publishing process is [based on GitFlow](https://datasift.github.io/gitflow/IntroducingGitFlow.html).
+Our publishing process is [based on GitFlow](https://web.archive.org/web/20231229171831/https://datasift.github.io/gitflow/IntroducingGitFlow.html).
 
 ```
 ## Review checklist template

activities/documentation/move-merge-delete-pages.md

@@ -43,7 +43,9 @@ redirect_from:
     - [url link 3]
 ```
 
-Note: the redirect url should be the file path without `.md` or `.html` extension.
+The redirect url should typically be the file path without `.md` or `.html` extension.
+The exception is for blog posts in the `blog` repository, where the blog post paths include the category and date, and the redirect _should_ include `.html` at the end.
+Thus, for blog posts the redirect needs to be of the form `/category/yyyy/mm/dd/the-post-slug.html`.
 
 ## Redirecting pages
 

activities/value-and-impact/all-press.md

@@ -26,7 +26,7 @@ You may also be interested in:
 
 * [Jan Ainali and the Foundation for Public Code](https://podcast.sustainoss.org/147) - the podcast [Sustain OSS](https://podcast.sustainoss.org/) interviews Jan Ainali (December 2022)
 * [An open source ecosystem for the public administration](https://www.oeffentliche-it.de/publikationen?doc=255694) [[PDF](https://www.oeffentliche-it.de/documents/10181/14412/Ein+Open-Source-%C3%96kosystem+f%C3%BCr+die+%C3%B6ffentliche+Verwaltung)] - by the German Competence Center Public IT ÖFIT (in German) (August 2022)
-* [Don’t Call It Alternative, Call It Normal](https://www.sdeps.eu/dont-call-it-alternative-call-it-normal/) - a chat with Aik van Eemeren, Public Tech Lead at the Chief Technology Office (CTO) of the Amsterdam municipality by [Shared Digital European Public Sphere](https://www.sdeps.eu/) (SDEPS) (January 2022)
+* [Don’t Call It Alternative, Call It Normal](https://web.archive.org/web/20230531221537/https://www.sdeps.eu/dont-call-it-alternative-call-it-normal/) - a chat with Aik van Eemeren, Public Tech Lead at the Chief Technology Office (CTO) of the Amsterdam municipality by [Shared Digital European Public Sphere](https://web.archive.org/web/20240101093950/https://www.sdeps.eu/) (SDEPS) (January 2022)
 
 ## 2021
 

organization/affiliates.md

@@ -1,6 +1,6 @@
 ---
 # SPDX-License-Identifier: CC0-1.0
-# SPDX-FileCopyrightText: 2022-2023 The Foundation for Public Code <[email protected]>
+# SPDX-FileCopyrightText: 2022-2024 The Foundation for Public Code <[email protected]>
 type: resource
 ---
 
@@ -15,6 +15,7 @@ These are our affiliates:
 
 * [Associació de Software Lliure Decidim](https://decidim.org) (Decidim Free Software Association)
 * [Dark Matter Labs](https://darkmatterlabs.org/)
+* [DFRI](https://dfri.se)
 * [OASC](https://oascities.org/)
 * [OS2](https://os2.eu/)
 * [OW2](https://www.ow2.org/)

organization/yearly-schedule.md

@@ -1,10 +1,10 @@
 ---
 # SPDX-License-Identifier: CC0-1.0
-# SPDX-FileCopyrightText: 2019-2023 The Foundation for Public Code <[email protected]>
+# SPDX-FileCopyrightText: 2019-2024 The Foundation for Public Code <[email protected]>
 type: resource
 ---
 
-# Yearly schedule 2023
+# Yearly schedule 2024
 
 This schedule shows recurring events the Foundation for Public Code prepares for every year. It includes public holidays when the office is closed.
 
@@ -16,25 +16,25 @@ This schedule shows recurring events the Foundation for Public Code prepares for
 
 ## February
 
-4-5 February: [FOSDEM public code and digital public goods devroom](https://fosdem.org/2023/schedule/track/public_code_and_digital_public_goods/)
+3-4 February: [FOSDEM public code and digital public goods devroom](https://fosdem.org/2024/schedule/track/public-code-and-digital-public-goods/)
 
 ## March
 
-## April
+29 March: Good Friday (public holiday in the Netherlands, office open)
 
-7 April: Good Friday (public holiday in the Netherlands, office open)
+## April
 
-9 April: Easter Monday (public holiday in the Netherlands, office closed)
+1 April: Easter Monday (public holiday in the Netherlands, office closed)
 
 27 April: King's day (public holiday in the Netherlands, office closed)
 
 ## May
 
 5 May: Liberation day (public holiday in the Netherlands every five years. Next time is 2025, office closed)
 
-18 May: Ascension day (public holiday in the Netherlands, office closed)
+9 May: Ascension day (public holiday in the Netherlands, office closed)
 
-28-29 May: Pentecost and Whit Monday (public holidays in the Netherlands, office closed)
+19-20 May: Pentecost and Whit Monday (public holidays in the Netherlands, office closed)
 
 ## June