Fix small misspellings (ocaml#3731)

CHANGES

@@ -552,12 +552,12 @@ are not marked).
 * Improve the syntax of filters
 * Add a `messages` field
 * Add a `--jobs` command line option and add `%{jobs}%` to be used in OPAM files
-* Various improvments in the solver heuristics
+* Various improvements in the solver heuristics
 * By default, turn-on checking of certificates for downloaded dependency archives: use `./configure --disable-certificate-check` to go back to the previous behavior
 * Check the md5sum of downloaded archives when compiling OPAM
 * Improved `opam info` command (more information, non-zero error code when no patterns match)
 * Display OS and OPAM version on internal errors to ease error reporting
-* Fix `opam reinstall` when reinstalling a package wich is a dependency of installed packages (regression introduced in 0.9.5)
+* Fix `opam reinstall` when reinstalling a package which is a dependency of installed packages (regression introduced in 0.9.5)
 * Export and read `OPAMSWITCH` to be able to call OPAM in different switches
 * `opam-client` can now be used in a toplevel
 * `-n` now means `--no-setup` and not `--no-checksums` anymore
@@ -700,7 +700,7 @@ are not marked).
 * improve opam-mk-repo
 * fix `opam search` to be caseless
 * ability to filter some commands (depending on some predicates) in opam file
-* improvments when packages disapear upstream
+* improvements when packages disappear upstream
 * check for ocaml 3.12.1 on configure
 * tell the user to unset some potentially dangerous variables when running opam
 * fix few git backend issues

doc/design/depexts-plugins

@@ -67,7 +67,7 @@ cases outlined above:
    or an explanation for the failure, while perform executes the actions (typically
    after user confirmation)
 
-The proposed module interface is purposedly incomplete, as it makes no assumption
+The proposed module interface is intentionally incomplete, as it makes no assumption
 on the way in which plugins are identified, and registered, which is an orthogonal
 issue.
 

doc/design/depopts-and-features

@@ -75,7 +75,7 @@ but presented in order of increased implementation complexity
         package is scheduled.
 
         The depopts: field is not used at all by the package dependencies
-        resolution phase, and must not be transalted into CUDF.
+        resolution phase, and must not be translated into CUDF.
 
         After the solver returns a solution, packages in this list that are
         present in the system are added with all their dependencies to the

doc/design/provides.md

@@ -35,7 +35,7 @@ versions.
 
 The feature provided can already be encoded without an extra field: given a list
 of packages that `provide` a given name, a package by this name can be added
-with a dependency towards either of those. However, on a repository maintainance
+with a dependency towards either of those. However, on a repository maintenance
 point of view, having to list all the alternatives adds much more burden.
 
 Besides, it's not possible, using pinning or an additional repository, to

doc/pages/External_solvers.md

@@ -61,7 +61,7 @@ For example, the preference `-removed` tells the solver that among all possible
 These combinators can be combined in a comma separated sequence, that is treated in lexicographic order by the solver.
 
 ### Default preferences for an upgrade
-For example, the preference `-removed,-notuptodate,-changed` tells the solver that after ensuring that removals are minimised, it should look for a solution that minimises also the number of packages wich are not at their latest version, and then reduce the changes to a minimum.
+For example, the preference `-removed,-notuptodate,-changed` tells the solver that after ensuring that removals are minimised, it should look for a solution that minimises also the number of packages which are not at their latest version, and then reduce the changes to a minimum.
 
 This is close to the default preference setting used by `opam` when you perform an update or an upgrade, and in practice it tries to bring _all_ your packages to the latest version available, as far as this does not implies removing too many packages. It can be set using the environment variable `OPAMUPGRADECRITERIA`, or the [`solver-upgrade-criteria:`](Manual.html#configfield-solver-upgrade-criteria) configuration field.
 
@@ -71,7 +71,7 @@ When you request to install a (set of) package(s), in general you do not expect
 ### Specifying preferences for opam
 
 `opam` allows to specify your criteria on the command line, using the `--criteria` option, that will apply only to the current command.
-For example if you are a very conservative user, you might try issueing the following command:
+For example, if you are a very conservative user, you might try issuing the following command:
 ```
 opam install --criteria="-removed,-changed" ...
 ```

doc/pages/Specifying_Solver_Preferences.md

@@ -25,7 +25,7 @@ For example, the preference  `-removed`  tells the solver that among all possibl
 These combinators can be combined in a comma separated sequence, that is treated in lexicographic order by the solver.
 
 ### Default preferences for an upgrade
-For example, the preference  `-removed,-notuptodate,-changed`  tells the solver that after ensuring that removals are minimised, it should look for a solution that minimises also the number of packages wich are not at their latest version, and then reduce the changes to a minimum.
+For example, the preference  `-removed,-notuptodate,-changed`  tells the solver that after ensuring that removals are minimised, it should look for a solution that minimises also the number of packages which are not at their latest version, and then reduce the changes to a minimum.
 
 This is the default preference setting used by `opam` when you perform an update or an upgrade, and in practice it tries to bring _all_ your packages to the latest version available, as far as this does not implies removing too many packages. It can be set using the environment variable `OPAMUPGRADECRITERIA`
 
@@ -35,7 +35,7 @@ When you request to install a (set of) package(s), in general you do not expect
 ### Specifying preferences for opam
 
 Recent versions of `opam` allow to specify your criteria on the command line, using the `--criteria` option, that will apply only to the current command.
-For example if you are a very conservative user, you might try issueing the following command:
+For example, if you are a very conservative user, you might try issuing the following command:
 ```
 opam install --criteria="-removed,-changed" ...
 ```

doc/pages/Tricks.md

@@ -103,7 +103,7 @@ to:
   is to use the `conflict-class:` field: add _e.g._ `conflict-class:
   "foo-implementation"` to all versions of both `a` and `b`.
 
-The need to define the virtual package explicitely also ensures that a third
+The need to define the virtual package explicitly also ensures that a third
 package can't inject a new implementation without that being visible in `foo`:
 it would otherwise be a security hole when we deploy end-to-end signing of
 packages.

opam-devel.opam

@@ -27,7 +27,7 @@ depends: [
   "dune" {build & >= "1.2.1"}
 ]
 post-messages: [
-"The development version of opam has been successfuly compiled into %{lib}%/%{name}%. You should not run it from there, please install the binaries to your PATH, e.g. with
+"The development version of opam has been successfully compiled into %{lib}%/%{name}%. You should not run it from there, please install the binaries to your PATH, e.g. with
     sudo cp %{lib}%/%{name}%/* /usr/local/bin
 
 If you just want to give it a try without altering your current installation, you could use instead:

shell/install.sh

@@ -120,7 +120,7 @@ fi
 
 TMP=${TMPDIR:-/tmp}
 
-ARCH=$(uname -m || echo unknwon)
+ARCH=$(uname -m || echo unknown)
 case "$ARCH" in
     x86|i?86) ARCH="i686";;
     x86_64|amd64) ARCH="x86_64";;
@@ -181,7 +181,7 @@ if [ -e "$TMP/$OPAM_BIN" ] && ! check_sha512 || [ ! -e "$TMP/$OPAM_BIN" ]; then
         if check_sha512; then
             echo "## Downloaded."
         else
-            echo "Checksum mismatch, a problem occured during download."
+            echo "Checksum mismatch, a problem occurred during download."
             exit 10
         fi
     fi

src/client/opamAdminCommand.ml

@@ -685,7 +685,7 @@ let env_arg =
           comma-separated 'var=value' bindings, when resolving variables. \
           This is used e.g. when computing available packages: if undefined, \
           availability of packages is not taken into account. Note that, \
-          unless overriden, variables like 'root' or 'opam-version' may be \
+          unless overridden, variables like 'root' or 'opam-version' may be \
           taken from the current opam installation. What is defined in \
           $(i,~/.opam/config) is always ignored.")
 

src/client/opamAuxCommands.mli

@@ -21,7 +21,7 @@ open OpamStateTypes
 val copy_files_to_destdir: 'a switch_state -> dirname -> package_set -> unit
 
 (** Removes all files that may have been installed by [copy_files_to_destdir];
-    it's more agressive than [OpamDirTrack.revert] and doesn't check if the
+    it's more aggressive than [OpamDirTrack.revert] and doesn't check if the
     files are current. *)
 val remove_files_from_destdir: 'a switch_state -> dirname -> package_set -> unit
 

src/client/opamCommands.ml

@@ -184,7 +184,7 @@ let init =
     `S "ARGUMENTS";
     `S "OPTIONS";
     `S "CONFIGURATION FILE";
-    `P "Any field from the built-in initial configuration can be overriden \
+    `P "Any field from the built-in initial configuration can be overridden \
         through $(i,~/.opamrc), $(i,/etc/opamrc), or a file supplied with \
         $(i,--config). The default configuration for this version of opam \
         can be obtained using $(b,--show-default-opamrc).";
@@ -285,7 +285,7 @@ let init =
   let no_sandboxing =
     mk_flag ["disable-sandboxing"]
       "Use a default configuration with sandboxing disabled (note that this \
-       may be overriden by `opamrc' if $(b,--no-opamrc) is not specified or \
+       may be overridden by `opamrc' if $(b,--no-opamrc) is not specified or \
        $(b,--config) is used). Use this at your own risk, without sandboxing \
        it is possible for a broken package script to delete all your files."
   in
@@ -1564,7 +1564,7 @@ let repository =
      package definitions anymore. With $(b,--all), makes opam forget about \
      these repositories completely.";
     "set-repos", `set_repos, ["NAME..."],
-    "Explicitely selects the list of repositories to look up package \
+    "Explicitly selects the list of repositories to look up package \
      definitions from, in the specified priority order (overriding previous \
      selection and ranks), according to the specified scope.";
     "set-url", `set_url, ["NAME"; "ADDRESS"; "[QUORUM]"; "[FINGERPRINTS]"],

src/client/opamConfigCommand.ml

@@ -41,7 +41,7 @@ let help t =
               >>| fst
               >>= Lazy.force) with
           | Some c when (OpamVariable.string_of_variable_contents c) <> content ->
-            "Set throught local opam config or env"
+            "Set through local opam config or env"
           | _ -> doc
         else doc
       in

src/client/opamInitDefaults.mli

@@ -9,7 +9,7 @@
 (**************************************************************************)
 
 (** This module defines a few defaults, used at 'opam init', that bind opam to
-    its default OCaml repository at https://opam.ocaml.org. All can be overriden
+    its default OCaml repository at https://opam.ocaml.org. All can be overridden
     through the init command flags or an init config file. *)
 
 open OpamTypes

src/core/opamProcess.ml

@@ -131,7 +131,7 @@ let string_of_info ?(color=`yellow) info =
     [cmd] with arguments [args]. If [stdout_file] or [stderr_file] are
     set, the channels are redirected to the corresponding files.  The
     outputs are discarded is [verbose] is set to false. The current
-    environment can also be overriden if [env] is set. The environment
+    environment can also be overridden if [env] is set. The environment
     which is used to run the process is recorded into [env_file] (if
     set). *)
 let create ?info_file ?env_file ?(allow_stdin=true) ?stdout_file ?stderr_file ?env ?(metadata=[]) ?dir

src/core/opamStd.mli

@@ -236,13 +236,13 @@ module String : sig
 
   (** {4 Transformations} *)
 
-  (** Cut a string at the first occurence of the given char *)
+  (** Cut a string at the first occurrence of the given char *)
   val cut_at: string -> char -> (string * string) option
 
   (** Same as [cut_at], but starts from the right *)
   val rcut_at: string -> char -> (string * string) option
 
-  (** Split a string at occurences of a given characters. Empty strings are
+  (** Split a string at occurrences of a given characters. Empty strings are
       skipped. *)
   val split: string -> char -> string list
 
@@ -419,7 +419,7 @@ module Sys : sig
   (** Indicates intention to exit the program with given exit code *)
   exception Exit of int
 
-  (** Indicates intention to exec() the given command (paramters as per
+  (** Indicates intention to exec() the given command (parameters as per
       [Unix.execvpe]), after proper finalisations. It's the responsibility of
       the main function to catch this, call [exec_at_exit], and
       [Unix.execvpe]. *)

src/core/opamVersionCompare.ml

@@ -75,7 +75,7 @@ let skip_zeros x xi xl = skip_while_from xi (fun c -> c = '0') x xl;;
 
 (* compare versions chunks, that is parts of version strings that are
  * epoch, upstream version, or revisision. Alternates string comparison
- * and numerical comaprison.  *)
+ * and numerical comparison.  *)
 let compare_chunks x y =
   (* x and y may be empty *)
   let xl = String.length x

src/format/opamVariable.ml

@@ -57,7 +57,7 @@ module Full = struct
     in
     { scope; variable }
 
-  (* Read the variables overriden through the environment *)
+  (* Read the variables overridden through the environment *)
   let read_from_env v =
     let var_str = to_string (variable v) in
     let undash = OpamStd.String.map (function '-' -> '_' | c -> c) in

src/repository/opamRepositoryBackend.mli

@@ -69,7 +69,7 @@ module type S = sig
   val revision: dirname -> version option OpamProcess.job
 
   (** Like [pull_url], except for locally-bound version control backends, where
-      it should get the latest, uncommited source. *)
+      it should get the latest, uncommitted source. *)
   val sync_dirty:
     dirname -> url -> filename option download OpamProcess.job
 
@@ -90,7 +90,7 @@ val local: dirname -> repository
     one [expected]. *)
 val check_digest: filename -> OpamHash.t option -> bool
 
-(** Adds a label to the given job, for the correspondig repository name and
+(** Adds a label to the given job, for the corresponding repository name and
     action *)
 val job_text:
   repository_name -> string -> 'a OpamProcess.job -> 'a OpamProcess.job

src/solver/opamCudf.ml

@@ -122,7 +122,7 @@ module Graph = struct
       let strong_deps, weak_deps =
         (* strong deps are mandatory (constraint appearing in the top
            conjunction)
-           weak deps correspond to optional occurences of a package, as part of
+           weak deps correspond to optional occurrences of a package, as part of
            a disjunction: e.g. in (A>=4 & (B | A<5)), A>=4 is strong, and the
            other two are weak. In the end we want to retain B and A>=4. *)
         List.fold_left (fun (strong_deps, weak_deps) l ->

src/solver/opamCudf.mli

@@ -143,7 +143,7 @@ val remove: Cudf.universe -> Cudf_types.pkgname -> Cudf_types.constr -> Cudf.uni
 val uninstall_all: Cudf.universe -> Cudf.universe
 
 (** Install a package in the universe. We don't care about any
-    invariant here (eg. the resulting universe can have mutliple
+    invariant here (eg. the resulting universe can have multiple
     versions of the same package installed). *)
 val install: Cudf.universe -> Cudf.package -> Cudf.universe
 

src/state/opamGlobalState.mli

@@ -39,7 +39,7 @@ val switch_exists: 'a global_state -> switch -> bool
 val installed_versions: 'a global_state -> name -> switch list package_map
 
 (** Default list of repositories to get packages from, ordered by decreasing
-    priority. This can be overriden by switch-specific selections, and does not
+    priority. This can be overridden by switch-specific selections, and does not
     have to include all configured repositories. *)
 val repos_list: 'a global_state -> repository_name list
 

src/state/opamStateTypes.mli

@@ -54,7 +54,7 @@ type +'lock global_state = {
   config: OpamFile.Config.t;
   (** The main configuration file. A note of caution: this corresponds to the
       configuration as loaded from the file: to get the current options, which
-      may be overriden through the command-line or environment, see
+      may be overridden through the command-line or environment, see
       OpamStateConfig *)
 
   global_variables:

src/state/opamUpdate.mli

@@ -47,7 +47,7 @@ val dev_packages:
 
 (** Updates a single dev or pinned package from its upstream. If [working_dir]
     is set, and the package is bound to a local, version-controlled dir, use the
-    working dir state instead of what has been commited to version control.
+    working dir state instead of what has been committed to version control.
 
     Returns true if changed, false otherwise, and a switch_state update
     function, applying possible changes in packages metadata *)

tests/README.unittest

@@ -9,7 +9,7 @@
 
       ./init-repo.sh -i
 
-* load a inital scenario (this command can be invoked multiple times): 
+* load an initial scenario (this command can be invoked multiple times):
 
       ./init-repo.sh -s 1
       ./init-repo.sh -s 2