Textual clarification and fixes

Signed-off-by: Yann Dirson <yann.dirson@vates.fr>

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 056248da8ca20380b9457d9bfd28e7301108ce03..bc16545534ee896a266f523612ec1c45a25b9bd7 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,7 +29,7 @@ Changelog](https://keepachangelog.com/en/1.0.0/)
   from Gitlab CI pipelines
 * APT repositories (though not signed) are now available from Gitlab
   CI pipelines
-* CI pipelines now testbuild every commit in a merge request
+* CI pipelines now testbuilds every commit in a merge request
 
 ## 0.2.0 - 2023-10-11
 

diff --git a/doc/release.md b/doc/release.md
index 78b676ce6c20cf58ac4c40a53e0af5cdb1d593ad..5a3f03103d6fa9eaee821c25789305bb92c23a1e 100644 (file)
--- a/doc/release.md
+++ b/doc/release.md
@@ -17,14 +17,16 @@ outputs:
 - source tarball
 
 operations:
-- check with `cargo outdated` not to miss any outdated dependency
-- update version in `Cargo.toml`
-- set release date in `CHANGELOG.md`, add link to prospective URL for Gitlab release
-- run `cargo tree` (or any cargo command updating the version in `Cargo.lock`
-- `git commit Cargo.toml Cargo.lock -m "Release $VERSION"`
-- `git tag $VERSION -m $VERSION`
-- update version in Cargo.toml to $NEXTVERSION-dev
-- create new entry for $NEXTVERSION in `CHANGELOG.md`
+- create release pull request, and get merged
+  - check with `cargo outdated` not to miss any outdated dependency
+  - update version in `Cargo.toml`
+  - set release date in `CHANGELOG.md`, add link to prospective URL for Gitlab release
+  - run `cargo tree` (or any cargo command updating the version in `Cargo.lock`
+  - `git commit Cargo.toml Cargo.lock -m "Release version $VERSION"`
+- `git tag $VERSION -m $VERSION`, push
+- create post-release pull request
+  - update version in Cargo.toml to $NEXTVERSION-dev
+  - create new entry for $NEXTVERSION in `CHANGELOG.md`
 
 ### source tarball