Merge branch 'main' into production

content/en/about/index.md

@@ -2,34 +2,20 @@
 title: About
 layout: layouts/page.njk
 permalink: /en/mission/
+eleventyNavigation:
+  key: Free Software unit
+  parent: About
+  order: 1
 ---
 
 *Aller à la page d'accueil [en Français](/fr/mission/).*
 
-# Introduction
-
-This page is the wiki of the free software unit of [Etalab](https://www.etalab.gouv.fr/)/[DINUM](https://www.numerique.gouv.fr/), in charge of the action plan for free software and digital commons for the French public administration.
-
-We publish here various resources about [code.gouv.fr](/en/) and our other products.
-
-# The Free software unit at Etalab/DINUM
+## The Free software unit at Etalab/DINUM
 
 [Read more](https://speakerdeck.com/bluehats/dinum-50b5bb2c-3e6c-4541-a988-b6fafcf446ca) on what is the Free software unit and what we do.
 
-# Free Software guides: using, publishing and contributing
-
-- [\[FR\] Introduction to the catalog of recommended free software](/fr/doc/sill/)
-- [Glossary](/en/doc/glossary/) for [code.gouv.fr](/en/)
-
-# Action plan for Free Software and digital commons
+## Action plan for Free Software and digital commons
 
 You can read the english translation of the French [action plan for Free Software and digital commons](/en/action-plan-for-free-software-and-digital-commons/) (Plan d'action logiciels libres et communs numériques).
 
-# Contribution Policy for Free Software of the State (2018-2021)
-
-- [Contribution Policy for Free Software of the State (2018-2021)](https://man.sr.ht/~codegouvfr/logiciels-libres/archives/pocos/index.en.md)
-
-# License of this document
-
-Contents of this repository are published under the [Open License 2.0](https://spdx.org/licenses/etalab-2.0.html).
 

content/en/expenditure-staff-impact.md

@@ -0,0 +1,74 @@
+---
+title: Expenditure, staff and impact of the Free Software unit
+layout: layouts/page.njk
+eleventyNavigation:
+  key: Expenditure, staff and impact
+  order: 3
+---
+
+In the interests of transparency, we are publishing the expenditure (to be [downloaded as a csv](/docs/mission-logiciels-libres-depenses-2021-2024.csv) for details) and staff numbers for the open source software mission from 2021 to 2024.
+
+## Expenditure
+
+<figure class="fr-content-media fr-content-media--sm" role="group" aria-label="Expenditure on the Free Software unit from 2021 to 2024">
+  <div class="fr-content-media__img">
+    <img src="/img/mission-logiciels-libres-depenses-2021-2024.png" class="fr-content-media--sm fr-responsive-img" alt="Expenditure on the Free Software unit from 2021 to 2024" />
+  </div>
+</figure>
+
+## Staff
+
+<figure class="fr-content-media fr-content-media--sm" role="group" aria-label="Staffing of the Free Software unit from 2021 to 2024">
+  <div class="fr-content-media__img">
+    <img src="/img/mission-logiciels-libres-effectifs-2021-2024.png" class="fr-content-media--sm fr-responsive-img" alt="Staffing of the Free Software unit from 2021 to 2024" />
+  </div>
+</figure>
+
+## Impact
+
+#### We develop and publish source code
+
+Our main products are widely reused:
+
+- [react-dsfr](https://github.com/codegouvfr/react-dsfr), [eleventy-dsfr](https://github.com/codegouvfr/eleventy-dsfr) and [docsify-dsfr-template](https://github.com/codegouvfr/docsify-dsfr-template/) are used by many of the services deployed by the incubators in the beta.gouv.fr network.
+- [sill](https://github.com/codegouvfr/sill), the [socle interministériel de logiciels libres](https://code.gouv.fr/sill/) application is currently being re-used by the Ministry of Higher Education and Research and the network of regional health agencies.
+
+<br/>
+
+#### We support government departments in their Free Software issues
+
+- 3 ministries supported in their Open Source publishing policy
+- 3 agencies supported in the creation of their Open Source Office Programme
+- 100+ answers provided in the search for Open Source alternatives
+- 20 repositories helped to choose their Free Software licence
+- 10 government departments helped with questions about the licences they use
+
+<br/>
+
+#### We promote open source software via the interministerial platform
+
+- 494 Free Software products referenced
+- 1810 registered users
+- 274 public servants registered as referents 
+- 183 public bodies represented
+
+<br/>
+
+
+#### We have developed our links with the ecosystem
+
+- 2022 agreement with ADULLACT ([PDF](/docs/Convention_Adullact-Dinum-2022.pdf))
+- 2022 agreement with CentraleSupelec for the BlueHats Semester of Code ([PDF](/docs/Convention_CentraleSupelec-Dinum-2021.pdf))
+- 2022 agreement with the OW2 association ([PDF](/docs/Convention_OW2_Dinum_2022.pdf))
+- 2023 agreement with the [NLnet foundation](https://nlnet.nl) ([PDF](/docs/DINUM-NLNET-convention-subvention-23112022.pdf))
+- 2023 agreement with ADULLACT ([PDF](/docs/Convention_DINUM_Adullact_2023.pdf))
+- 2024 agreement with the Descodeuses association ([PDF](/docs/Convention_Descodeuses_Dinum_2024.pdf))
+
+<br/>
+
+#### We're helping to drive the BlueHats movement 🧢
+
+- 30 BlueHats gazettes
+- 54 BlueHats workshops
+- 8 BlueHats meetings
+- 5 BlueHats days at the Open Source Experience exhibition

content/en/index.njk

@@ -1,5 +1,5 @@
 ---
-title: French Free Software Unit
+title: Free Software unit
 layout: layouts/home.njk
 eleventyNavigation:
   key: Home
@@ -11,8 +11,7 @@ eleventyNavigation:
       <div class="fr-col-10 fr-col-md-6">
         <h1>{{ title }}</h1>
         <p class="fr-text--lead">
-          Assisting government agencies in <strong>increasing their use of Free and Open Source software</strong> and
-          supporting their efforts to <strong>publish source code</strong>.
+          Assisting government agencies in <strong>increasing their use of Free and Open Source software</strong> and supporting their efforts to <strong>publish source code</strong>.
         </p>
       </div>
       <div class="fr-hidden fr-unhidden-md fr-col-md-4">