ecmwf · tlmquintino · Jul 13, 2026 · Jul 13, 2026 · Jul 13, 2026 · Jul 13, 2026
diff --git a/ADR/ADR-001-Git-Branching-Model.md b/ADR/ADR-001-Git-Branching-Model.md
@@ -1,7 +1,7 @@
 # Architectural Decision Record 001: Git Branching Model
 
 ## Status
-[<s>Proposed</s> | Accepted | <s>Deprecated</s> | <s>Superseded by [ADR-XXX]</s>]
+<s>Proposed</s> | **Accepted** | <s>Deprecated</s> | <s>Superseded by [ADR-XXX]</s>
 
 ## Last Updated
 2025-06-25
@@ -193,6 +193,10 @@ The reverse can also happen, where a repository using Git Flow can revert to Git
 
 ### Migration Path
 
+> The authoritative, up-to-date operational migration procedure is maintained in
+> [Guidelines/Branching.md](../Guidelines/Branching.md). The summary below records
+> the intent at the time of this decision.
+
 When upgrading from GitHub Flow to Git Flow:
 
 * Create develop branch from current main
@@ -210,7 +214,7 @@ These decisions listed below were taken into account and they preexist this ADR.
 * CI/CD pipeline configuration must support both GitHub Flow and Git Flow
 * Code review exist for both branching models GitHub Flow and Git Flow
 * Branch protection rules must be configured appropriately for each model, with main/master and develop branches protected for changes only by pull requests accepted by GateKeepers
-* Deployment strategies may vary with the system or service and are not ncecessarily dependent on the chosen workflow, i.e. continuous vs. scheduled, where most ECMWF is deployed into operations with a scheduled release process.
+* Deployment strategies may vary with the system or service and are not necessarily dependent on the chosen workflow, i.e. continuous vs. scheduled, where most ECMWF is deployed into operations with a scheduled release process.
 
 ## Consequences
 

diff --git a/ADR/ADR-002-Approved-Dependency-CLI11.md b/ADR/ADR-002-Approved-Dependency-CLI11.md
@@ -1,6 +1,6 @@
 # Architectural Decision Record 002: Approved C++ Dependency CLI11
 
- ## Status
+## Status
 
 <s>Proposed</s> | **Accepted** | <s>Deprecated</s> | <s>Superseded by [ADR-XXX]</s>
 

diff --git a/ADR/ADR-003-PyBind11-For-CPP-Bindings.md b/ADR/ADR-003-PyBind11-For-CPP-Bindings.md
@@ -2,7 +2,7 @@
 
 ## Status
 
-[<s>Proposed</s> | **Accepted** | <s>Deprecated</s> | <s>Superseded by [ADR-XXX]</s>]
+<s>Proposed</s> | **Accepted** | <s>Deprecated</s> | <s>Superseded by [ADR-XXX]</s>
 
 ## Last Updated
 

diff --git a/ADR/ADR-004-Cascade-Features.md b/ADR/ADR-004-Cascade-Features.md
@@ -1,7 +1,7 @@
 # Architectural Decision Record 004: Building Cascade
 
 ## Status
-[<s>Proposed</s> | **Accepted** | <s>Deprecated</s> | <s>Superseded by [ADR-XXX]</s>]
+<s>Proposed</s> | **Accepted** | <s>Deprecated</s> | <s>Superseded by [ADR-XXX]</s>
 
 ## Last Updated
 2025-07-28
@@ -14,7 +14,7 @@ This record captures the decision making of the initial feature set and design,
 
 ### Options Considered
 
-Firstly, we considered using Dask as a comprehensive offering, and analyzed it in greater detail.
+Firstly, we considered using Dask as a comprehensive offering, and analysed it in greater detail.
 Other Dask-like solutions like Daft or Spark were not analysed thoroughly -- while they are presumably more performant than Dask in certain cases, the top level design and intent is very similar, and thus arguments again Dask apply equally. 
 Another possible option was Ray, which is has a less restrictive model than Dask, but based on a shallow analysis of its performance and ease of extensibility, we opted not to explore it further.
 
@@ -60,7 +60,7 @@ We purposefully don't implement a resource negotiator inside Cascade, as we don'
 Instead, we rely on external one (currently Slurm, eventually Troika), and only expect a thin wrapper to invoke the resource negotiation and bootstrap Cascade processes.
 
 For workflow executors, there is always the question whether the workflows themselves are aware of the executor, tightly coupled to it.
-We chose a middle path -- we implement lightweight adapters (organized in a plugin fashion) for each class of workflow elements.
+We chose a middle path -- we implement lightweight adapters (organised in a plugin fashion) for each class of workflow elements.
 For example, individual Anemoi or PProc functions are oblivious of Cascade, but there exists Earthkit-Workflows-Anemoi and Earthkit-Workflows-Pproc which wrap anemoi runners or pproc pipelines in a Cascade-compatible fashion.
 Those are exposed to the user in a fluent-style API.
 This is additionally only thinly coupled to Cascade -- thus Cascade can execute workflows declared without fluent/plugin API, and vice versa we could implement a different executor for those fluent-declared objects.

diff --git a/ADR/ADR-005-Storing-Of-ICON-Grid-Files.md b/ADR/ADR-005-Storing-Of-ICON-Grid-Files.md
@@ -1,7 +1,7 @@
-# Architectural Decision Record 004: Storing of MeteoSwiss ICON Grid Definition Files
+# Architectural Decision Record 005: Storing of MeteoSwiss ICON Grid Definition Files
 
 ## Status
-[<s>Proposed</s> | **Accepted** | <s>Deprecated</s> | <s>Superseded by [ADR-XXX]</s>]
+<s>Proposed</s> | **Accepted** | <s>Deprecated</s> | <s>Superseded by [ADR-XXX]</s>
 
 ## Last Updated
 2026-02-18

diff --git a/ADR/ADR-006-MARS-Model-Keyword-for-DestinE-ODEDT.md b/ADR/ADR-006-MARS-Model-Keyword-for-DestinE-ODEDT.md
@@ -1,95 +1,23 @@
 # Architectural Decision Record 006: MARS Model Keyword for DestinE ODEDT (DE330)
 
-# Status
+## Status
 
-Withdrawn - Moved to become MARS Language Decision Record
+<s>Proposed</s> | <s>Accepted</s> | <s>Deprecated</s> | **Withdrawn** — moved to [MARS-001](../MARS%20language/MARS-001-MARS-Model-Keyword-for-DestinE-ODEDT.md)
 
-# Last Updated
+## Last Updated
 
-20.03.2026
+2026-03-20
 
-# Context
+## Context
 
-### Background
+This decision was withdrawn from the ADR series and moved to the MARS Language
+Decision Records, which govern changes to the MARS language. The proposal —
+introducing a `model` keyword to the `on-demand-extremes-dt` data index for
+Destination Earth (DE330) — is recorded in full, and kept up to date, in
+[MARS-001: MARS Model Keyword for DestinE ODEDT](../MARS%20language/MARS-001-MARS-Model-Keyword-for-DestinE-ODEDT.md).
+Refer to MARS-001 for the authoritative record.
 
-The on-demand-extremes-dt routinely runs multiple models covering the same period, such as different NWP models (ALARO, AROME, HARMONIE-AROME) as well as several impact models (AQ, Hydrology, renewables, wildfire etc.).
-
-Thus, an additional axis is needed to cope with several models running with all other mars metadata identical. To this end we would introduce the model keyword to the on-demand-extremes-dt data index, as has been introduced in other datasets and contexts such as class=ai. We would add the model keyword in the same way here. Thus this represents a consistent approach in-line with other datasets.
-
-Values in ecCodes are currently as follows, but would be extended as the impact models become known and well formed ( `localConcepts/destine/modelNameConcept` ):
-
-- IFS
-- AIFS
-- ICON
-- ALARO
-- AROME
-- HARMONIE-AROME
-- \<air-quality-impact-model\> (to be updated with value from DE330)
-- \<hydrology-impact-model\> (to be updated with value from DE330)
-- \<wildfire-impact-model\> (to be updated with value from DE330)
-- …
-
-### MARS archiving approach
-
-MARS namespace:
-
-<pre><code>{
-  "messages": [
-    {
-      "date": 20260211,
-      "time": 1200,
-      "expver": "0001",
-      "class": "d1",
-      "dataset": "on-demand-extremes-dt",
-      "georef": "u23er4",
-      "type": "fc",
-      "stream": "oper",
-      "step": 6,
-      "levtype": "sfc",
-      <strong>"model": "HARMONIE-AROME",</strong>
-      "timespan": "none",
-      "param": 167
-    }
-  ]
-}
-</code></pre>
-
-# Options Considered
-
-### 1. Include model key
-
-We believe this key is necessary to index data coming from different models within the on-demand Extremes DT project.
-
-# Analysis
-
-- Prototype at: [text](https://github.com/ecmwf/eccodes/tree/feature/ECC-2222-model-for-de330)
-- This has been introduced in other datasets such as class=ai. We would add the model keyword in the same way here. Thus this represents a consistent approach in-line with other datasets.
-
-# Decision
-
-Meeting was held on 06/03/2026 to discuss the proposal with:
-
-- Simon Smart
-- Emanuele Danovaro
-- Seb Villaume
-- Robert Osinski
-- Bojan Kasic
-
-Following up meeting to confirm with User Services with:
-
-- Paul Dando
-- Bojan Kasic
-
-Everyone was happy with the proposal. We will proceed with the implementation.
-
-# Consequences
-
-- ecCodes development to add model keyword to indexing namespace for on-demand-extremes-dt data
-- metkit development to add new values of model keyword to language file.
-
-# References
-
-# Authors
+## Authors
 
 - Matthew Griffith
 - Sebastien Villaume

diff --git a/ADR/ADR-007-Approved-Dependency-libfmt.md b/ADR/ADR-007-Approved-Dependency-libfmt.md
@@ -45,7 +45,7 @@ libfmt features (named arguments, custom join separators, terminal colours,
 `fmt::memory_buffer`) have no standard equivalent at any horizon.
 
 libfmt is the reference implementation from which `std::format` was
-standardized. Its author, Victor Zverovich, is also the author and editor of the
+standardised. Its author, Victor Zverovich, is also the author and editor of the
 C++ formatting papers (P0645 for `std::format`, P2093 for `std::print`). The
 libfmt API and the standard API are the same by design.
 
@@ -98,7 +98,7 @@ Defer until the codebase migrates to C++20, then use `std::format` directly.
   Comparison](#feature-comparison-c20-vs-c23-vs-libfmt) — Tier 1). It does not
   include `std::print` (C++23), range formatting (C++23), or features like
   named arguments, custom join separators, and terminal colours (never
-  standardized).
+  standardised).
 - Some `std::format` implementations have been slower and produced larger
   binaries than libfmt. The gap is narrowing but was significant in early
   GCC libstdc++ releases.
@@ -160,7 +160,7 @@ Effectively abandoned. Last meaningful update circa 2014. Not a viable option.
 
 [libfmt](https://github.com/fmtlib/fmt)
 
-The reference implementation that was standardized as `std::format` in C++20 and
+The reference implementation that was standardised as `std::format` in C++20 and
 `std::print` in C++23. Provides a type-safe, performant, and expressive
 formatting API with features that go beyond any current or proposed C++ standard
 revision.

diff --git a/ADR/ADR-Guidelines.md b/ADR/ADR-Guidelines.md
@@ -129,7 +129,7 @@ Before finalizing an ADR, ensure it meets these criteria:
 - Use sequential numbering: ADR-001-Meaningful-Title, ADR-002-Another-Meaningful-Title, etc.
 - Store ADRs in the central **Codex** repository under `/ADR/`
 - Use descriptive filenames: `ADR-001-Git-Branching-Model.md`
-- Use the [ADR index](./ADR-Index.md) to track all ADRs and their statuses
+- Use the [ADR index](./README.md) to track all ADRs and their statuses
 
 ## Review Process
 

diff --git a/ADR/ADR-Template.md b/ADR/ADR-Template.md
@@ -1,7 +1,7 @@
 # Architectural Decision Record XXX: Title of the Decision
-
 ## Status
-[**Proposed** | <s>Accepted</s> | <s>Deprecated</s> | <s>Superseded by [ADR-XXX]</s>]
+
+**Proposed** | <s>Accepted</s> | <s>Deprecated</s> | <s>Superseded by [ADR-XXX]</s>
 
 ## Last Updated
 YYYY-MM-DD

diff --git a/ADR/README.md b/ADR/README.md
@@ -15,9 +15,9 @@ Architectural Decision Records capturing key technical decisions for ECMWF softw
 | [ADR-002 Approved Dependency CLI11](./ADR-002-Approved-Dependency-CLI11.md) | Accepted |
 | [ADR-003 PyBind11 for C++ Bindings](./ADR-003-PyBind11-For-CPP-Bindings.md) | Accepted |  
 | [ADR-004 Cascade Features](./ADR-004-Cascade-Features.md) | Accepted |
-| [ADR-005 Storing of ICON Grid Files](./ADR-005-Storing-Of-ICON-Grid-Files.md) | Accepted |
+| [ADR-005 Storing of MeteoSwiss ICON Grid Definition Files](./ADR-005-Storing-Of-ICON-Grid-Files.md) | Accepted |
 | [ADR-006 MARS Model Keyword for DestinE ODEDT](./ADR-006-MARS-Model-Keyword-for-DestinE-ODEDT.md) | Withdrawn — moved to [MARS-001](../MARS%20language/MARS-001-MARS-Model-Keyword-for-DestinE-ODEDT.md) |
-| [ADR-007 Approved Dependency libfmt](./ADR-007-Approved-Dependency-libfmt.md) | Proposed |
+| [ADR-007 Approved Dependency libfmt](./ADR-007-Approved-Dependency-libfmt.md) | Accepted |
 | [ADR-008 From-Source Builds for C++ Stack Dependencies](./ADR-008-Stack-Dependencies.md) | Accepted |
 | [ADR-009 Repository Audit Store](./ADR-009-Repository-Audit-Store.md) | Accepted |
 | [ADR-010 Adopt SPDX Licence Identifiers and REUSE-Compliant File Headers](./ADR-010-SPDX-License-Identifiers-and-REUSE-Headers.md) | Accepted |

diff --git a/Agent Skills/README.md b/Agent Skills/README.md
@@ -1,6 +1,10 @@
 # Agent Skills
 
-Reusable AI-agent skills that support ECMWF software governance processes.
+Reusable AI-agent skills that support ECMWF software governance processes. These
+skills are AI agents and operate under the
+[AI Contributions to Software](../Guidelines/Ai-Contributions-To-Software.md)
+guidelines: they keep a human in the loop, and they **report and gate rather
+than act** — they never merge, fix, or publish on their own.
 
 ## Skills
 
@@ -10,11 +14,13 @@ Reusable AI-agent skills that support ECMWF software governance processes.
   contents against the Codex open-sourcing guidance and common publication
   risks, including licensing, README/maturity information, full-history secret
   scanning, dependency licence review, git-history hygiene, and CI
-  configuration. Its mandatory security step is delegated to the `security-audit`
-  skill.
+  configuration. It prompts for a separate `security-audit` (required before
+  publication). A not-yet-run security audit is advisory; a security audit that
+  has been run and whose verdict is `NOT_READY` (i.e. it has open CRITICAL/HIGH
+  findings — see the `security-audit` skill) is a blocker.
 - [`security-audit`](./security-audit/SKILL.md) — risk-tiered security audit of
-  a repository, run before publication (as the mandatory security step of the
-  open-source audit) and periodically afterwards. Builds a threat model,
+  a repository, run before publication (the security step of the open-source
+  audit) and periodically afterwards. Builds a threat model,
   runs SAST / dependency / supply-chain tooling, reviews security-sensitive
   surfaces, and for high-risk repositories adds adversarial testing and bounded
   fuzzing. Produces a CWE-tagged pass/fail report.

diff --git a/Contributing Upstream/Forking.md b/Contributing Upstream/Forking.md
@@ -2,6 +2,8 @@
 
 External collaborators of ECMWF are expected to fork our repositories and then make a pull request from their fork. Likewise if we wish to contribute to other repositories, we often need to create a fork. This fork should exist in ECMWF GitHub but we want to take care that we distinguish it from code we own.
 
+This page covers **ECMWF forking an external repository** (to prepare upstream contributions, or to maintain an ECMWF variant). The same mechanics appear in the "Fork" option for *inheriting* an external repository in [External Contributions](../Guidelines/External-Contributions.md); that section should point here for the standard notice template below.
+
 ## Process
 
 1. Fork the repository. It will be public and cannot be changed.

diff --git a/Contributing Upstream/README.md b/Contributing Upstream/README.md
@@ -1 +1,10 @@
-- [Forking External Repositories](./Forking.md)
+# Contributing to External Projects
+
+Guidance for when ECMWF contributes to, or forks, repositories owned by other
+organisations — for example upstreaming fixes, or maintaining an ECMWF variant of
+an external project. For contributions *into* ECMWF repositories, see
+[External Contributions](../Guidelines/External-Contributions.md).
+
+## Contents
+
+- [Forking External Repositories](./Forking.md) — how to fork an external repository into the ECMWF organisation and mark it clearly as a fork
diff --git a/Documentation and Training/Documentation-Publishing-On-Sites.md b/Documentation and Training/Documentation-Publishing-On-Sites.md
@@ -249,8 +249,8 @@ structure:
 │   ├── pull_requests/  # Not Indexed
 │   │   ├── PR-XXX/     # Will be deleted when PR is closed
 │   │   └── PR-YYY/     # Will be deleted when PR is closed
-│   ├── v1.2.3/         # Indexed through version.json
-│   ├── v1.2.4/         # Indexed through version.json
+│   ├── 1.2.3/         # Indexed through version.json
+│   ├── 1.2.4/         # Indexed through version.json
 │   ├── develop/        # Indexed through version.json
 │   ├── latest/         # Indexed through version.json / Softlink to develop
 │   ├── master/         # Indexed through version.json
@@ -435,7 +435,7 @@ regenerates the Sphinx version selector.
 2. Uploads HTML to `<path>/<id>` via
    [`ecmwf-sites-upload`](#ecmwf-sites-upload)
 3. If `softlink` is provided, creates a server-side softlink via
-   `PUT` — e.g. `<path>/stable` -> `<path>/v2.1.0`. No content
+   `PUT` — e.g. `<path>/stable` -> `<path>/2.1.0`. No content
    is duplicated.
 4. Runs [`generate-version-selector`](#generate-version-selector)
    to rebuild `version.json` for the Sphinx version dropdown
@@ -447,11 +447,11 @@ Versioned:   https://sites.ecmwf.int/<space>/<name>/<path>/<id>/
 Softlinked:  https://sites.ecmwf.int/<space>/<name>/<path>/<softlink>/
 ```
 
-Example with `path: fdb`, `id: v5.2.0`, `softlink: stable`:
+Example with `path: fdb`, `id: 5.2.0`, `softlink: stable`:
 
 ```
-.../docs/dev-section/fdb/v5.2.0/   <- concrete version
-.../docs/dev-section/fdb/stable/    <- softlink to v5.2.0
+.../docs/dev-section/fdb/5.2.0/   <- concrete version
+.../docs/dev-section/fdb/stable/    <- softlink to 5.2.0
 ```
 
 ##### Inputs