From 068c3937371a029d2272e980241699060029b74f Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Mon, 29 Apr 2024 14:45:26 +0200 Subject: [PATCH] More copyediting Signed-off-by: Gilles Peskine --- docs/framework-design.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/framework-design.md b/docs/framework-design.md index 663391353..ae01c1022 100644 --- a/docs/framework-design.md +++ b/docs/framework-design.md @@ -91,7 +91,7 @@ For example: * CI in consuming repositories must support Git submodules. Other than that, keep the CI as it is now. In particular, the CI in consuming repositories does not need to consider anything but the commit that the framework submodule points to. * CI in the framework repository should run a subset of the CI of all consuming branches, to warn about unintended breakage. This way, most of the time, updating the framework submodule in a consuming branch to the tip of the `main` branch should work. Gatekeepers can bypass this check if the incompatibility is deliberate. -* When merging a pull request to in an official branch in a consuming repository (`development`, LTS branches), check that the framework submodule's commit is on the main branch of the `mbedtls-framework` submodule. +* When merging a pull request to an official branch in a consuming repository (`development`, LTS branches), check that the framework submodule's commit is on the main branch of the `mbedtls-framework` submodule. TODO: once this is set up, detail the processes here.