typo: s/environement/environment

ocaml · Nov 10, 2023 · 6b09ef7 · 6b09ef7
1 parent e37474b
commit 6b09ef7
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/doc/pages/Manual.md b/doc/pages/Manual.md
@@ -659,24 +659,24 @@ file it is the [`x-env-path-rewrite:`](#opamfield-x-env-path-rewrite) field, of
 form:
 
 ```BNF
-<environement-rewrites> ::= { <environement-rewrite> }*
-<environement-rewrite>  ::= <ident> <bool>
-                          | <ident> <separator-formula> <path-format-formula>
-
-<separator-formula>     ::= <separator-formula> "|" <separator-formula>
-                          | ( <separator-formula> )
-                          | <separator> { { <distrib-formula> }* }
-<path-format-formula>   ::= <path-format-formula> "|" <path-format-formula>
-                          | ( <path-format-formula> )
-                          | <path-format> { { <distrib-formula> }* }
-
-<separator>             ::= (") ":" (") | (") ";" (")
-<path-format>           ::= (") "host" (") | (") "host-quoted" (") | (") "target" (") | (") "target-quoted" (")
-
-<distrib-formula>       ::= <distrib-formula> <logop> <distrib-formula>
-                          | "!" <distrib-formula>
-                          | "(" <distrib-formula> ")"
-<logop>                 ::= "&" | "|"
+<environment-rewrites> ::= { <environment-rewrite> }*
+<environment-rewrite>  ::= <ident> <bool>
+                         | <ident> <separator-formula> <path-format-formula>
+
+<separator-formula>    ::= <separator-formula> "|" <separator-formula>
+                         | ( <separator-formula> )
+                         | <separator> { { <distrib-formula> }* }
+<path-format-formula>  ::= <path-format-formula> "|" <path-format-formula>
+                         | ( <path-format-formula> )
+                         | <path-format> { { <distrib-formula> }* }
+
+<separator>            ::= (") ":" (") | (") ";" (")
+<path-format>          ::= (") "host" (") | (") "host-quoted" (") | (") "target" (") | (") "target-quoted" (")
+
+<distrib-formula>      ::= <distrib-formula> <logop> <distrib-formula>
+                         | "!" <distrib-formula>
+                         | "(" <distrib-formula> ")"
+<logop>                ::= "&" | "|"
 ```
 
 The `<separator>` defines the path separator to use for the variable.

diff --git a/master_changes.md b/master_changes.md
@@ -162,7 +162,7 @@ users)
   * `OpamFilter`: add `expand_interpolations_in_file_full` which allows setting the output file along with the input file [#5629 @rgrinberg]
   * `OpamFilter`: expose `string_interp_regex` which allows clients to identify variable interpolations in strings [#5633 @gridbugs]
   * `OpamTypes.env_update`: change from tuple to a record [#5636 @rjbou]
-  * `OpamTypes.env_update`: add a `rewrite` field, that contains environement variable rewriting rules (formula to resolved, or already resolved, or no rewriting) [#5636 @rjbou]
+  * `OpamTypes.env_update`: add a `rewrite` field, that contains environment variable rewriting rules (formula to resolved, or already resolved, or no rewriting) [#5636 @rjbou]
   * `OpamPp.fallback`: add name concatenation and printing fallback too [#5636 @rjbou]
   * `OpamFormat`: add `formula_items` to permit definition of formulae pp not only of the type `package-formula` [#5636 @rjbou]
   * `OpamTypesBase`: add to_string function for `path_format` & `separator` [#5636 @rjbou]

diff --git a/src/format/opamTypes.mli b/src/format/opamTypes.mli
@@ -399,7 +399,7 @@ type stats = {
   s_remove   : int;
 }
 
-(** Environement variables: var name, value, optional comment *)
+(** Environment variables: var name, value, optional comment *)
 type env = (OpamStd.Env.Name.t * string * string option) list
 
 type path_format =

diff --git a/tests/reftests/cli-versioning.test b/tests/reftests/cli-versioning.test
@@ -133,7 +133,7 @@ The following actions will be performed:
 <><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 -> removed   env-2-1.1
 Done.
-### # Environement variables cli versioning
+### # Environment variables cli versioning
 ### OPAMBUILDDOC=1 opam var share
 [WARNING] OPAMBUILDDOC was ignored because CLI 2.2 was requested and it was removed in 2.1, set OPAMCLI environment variable to 2.0.
 ${BASEDIR}/OPAM/cli-versioning/share