diff --git a/doc/pages/Manual.md b/doc/pages/Manual.md index 211e70cd85f..50172f977bb 100644 --- a/doc/pages/Manual.md +++ b/doc/pages/Manual.md @@ -1154,11 +1154,12 @@ files. [solver criteria](#configfield-solver-criteria). This can be useful for beta releases, or to discourage installation of releases with known bugs. Note that this behaviour is disabled when a flagged version of the package - is already installed. + is already installed. This was introduced in opam 2.1. - `deprecated`: this flag is equivalent to [`avoid-version`](#opamflag-avoid-version) except for the addition of a deprecation message after the package is installed as well as marked as - deprecated in the solution shown to the user upon installation. + deprecated in the solution shown to the user upon installation. This was + introduced in opam 2.2. - `features: [ { { } ... } { } ... ]` diff --git a/master_changes.md b/master_changes.md index 64d2b77cc2e..debb4561d70 100644 --- a/master_changes.md +++ b/master_changes.md @@ -154,6 +154,7 @@ users) * Manual: Document the stamp field from repo files [#6306 @kit-ty-kate] * Fix typo in pin edit man page doc [#6315 @shym] * Clarify documentation for `enable` pseudo-variable [#5659 @gridbugs] + * Manual: add information when flags (`avoid-version`, `deprecated`) were introduced [#6320 @hannesm] ## Security fixes