From 0a2e435aead1b51acfd07aded617a6ce62b9573c Mon Sep 17 00:00:00 2001 From: Jesper Quorning Date: Fri, 15 May 2020 18:04:13 +0200 Subject: [PATCH] Proofreading with aspell (#410) * Typo: Usage_Custom_Parameters * Typo: environment 2 * Typo: appropriate * Typo: Additionally * Typo: executable * Typo: explicitly * Typo: expression * Typo: foolproof * Typo: representation * Typo: suggestion * Typo: only * Typo: without * Typo: successfully * Typo: overridden (4x) * Typo: happened * Typo: deployment * Typo: recursively * Typo: development * Typo: environment * Typos: permanent/orderly * Typo: Unfortunately * Typo: succeeds (2x) Co-authored-by: Alejandro R Mosteo --- src/alire/alire-conditional_trees.adb | 2 +- src/alire/alire-defaults.ads | 2 +- src/alire/alire-features-index.adb | 2 +- src/alire/alire-interfaces.ads | 2 +- src/alire/alire-lockfiles.ads | 8 ++++---- src/alire/alire-origins-deployers-source_archive.adb | 6 +++--- src/alire/alire-origins-deployers-system.ads | 2 +- src/alire/alire-origins-deployers.adb | 2 +- src/alire/alire-origins-deployers.ads | 2 +- src/alire/alire-origins.ads | 2 +- src/alire/alire-os_lib-subprocess.ads | 9 +++++---- src/alire/alire-paths.ads | 2 +- src/alire/alire-releases.ads | 2 +- src/alire/alire-solver.adb | 2 +- src/alire/alire-toml_expressions-cases.ads | 2 +- src/alire/alire-toml_expressions.ads | 2 +- src/alire/alire-utils-tools.ads | 2 +- src/alire/alire-utils.ads | 4 ++-- src/alr/alr-commands-setenv.adb | 4 ++-- src/alr/alr-commands-withing.adb | 2 +- src/alr/alr-commands.ads | 2 +- src/alr/alr-paths.ads | 2 +- src/alr/os_windows/alr-platforms-windows.adb | 4 ++-- 23 files changed, 35 insertions(+), 34 deletions(-) diff --git a/src/alire/alire-conditional_trees.adb b/src/alire/alire-conditional_trees.adb index c9dd1016..ef8ad3b7 100644 --- a/src/alire/alire-conditional_trees.adb +++ b/src/alire/alire-conditional_trees.adb @@ -172,7 +172,7 @@ package body Alire.Conditional_Trees is if This in Leaf_Node then Inner.Values.Append (This); elsif This in Vector_Node then - -- Flatten ofly if conjunction matches, otherwise just append + -- Flatten only if conjunction matches, otherwise just append -- subtree. if Vector_Node (This).Conjunction = Conj then for Child of Vector_Node (This).Values loop diff --git a/src/alire/alire-defaults.ads b/src/alire/alire-defaults.ads index baa58438..9820fd84 100644 --- a/src/alire/alire-defaults.ads +++ b/src/alire/alire-defaults.ads @@ -4,7 +4,7 @@ package Alire.Defaults with Preelaborate is -- TODO: replace this constant with a function that returns random fortunes Docker_Test_Image : constant String := "alire/gnat:debian-stable"; - -- Docker image to be used with `alr test --docker` unless overriden + -- Docker image to be used with `alr test --docker` unless overridden Maintainer : constant String := "your@email.here"; diff --git a/src/alire/alire-features-index.adb b/src/alire/alire-features-index.adb index 975ee565..b061e8f7 100644 --- a/src/alire/alire-features-index.adb +++ b/src/alire/alire-features-index.adb @@ -324,7 +324,7 @@ package body Alire.Features.Index is Result : constant Outcome := Index.Update; begin if Result.Success then - Trace.Detail ("Updated succesfully: " & Index.Origin); + Trace.Detail ("Updated successfully: " & Index.Origin); else return Result; end if; diff --git a/src/alire/alire-interfaces.ads b/src/alire/alire-interfaces.ads index b22ff2f0..750a3001 100644 --- a/src/alire/alire-interfaces.ads +++ b/src/alire/alire-interfaces.ads @@ -51,6 +51,6 @@ package Alire.Interfaces with Preelaborate is type Yamlable is limited interface; function To_YAML (This : Yamlable) return String is abstract; - -- Return a YAML text repsentation of the object + -- Return a YAML text representation of the object end Alire.Interfaces; diff --git a/src/alire/alire-lockfiles.ads b/src/alire/alire-lockfiles.ads index 2d6fd7d3..a0898295 100644 --- a/src/alire/alire-lockfiles.ads +++ b/src/alire/alire-lockfiles.ads @@ -3,10 +3,10 @@ with Alire.Solver; package Alire.Lockfiles is - -- A crate lockfile stores the dependency solution in use. This permanente - -- storage, in /crate_name.lock, is the basis for ordely uploads and - -- pinning. This file is autogenerated and manipulated via alr commands; - -- the user should not modify it. + -- A crate lockfile stores the dependency solution in use. This permanent + -- storage, in /crate_name.lock, is the basis for orderly uploads + -- and pinning. This file is autogenerated and manipulated via alr + -- commands; the user should not modify it. function File_Name (Name : Crate_Name; Root_Dir : Any_Path) return Any_Path; diff --git a/src/alire/alire-origins-deployers-source_archive.adb b/src/alire/alire-origins-deployers-source_archive.adb index 04f2f919..aab77b5a 100644 --- a/src/alire/alire-origins-deployers-source_archive.adb +++ b/src/alire/alire-origins-deployers-source_archive.adb @@ -40,9 +40,9 @@ package body Alire.Origins.Deployers.Source_Archive is -- On some versions of tar found on Windows, an option is required -- to force e.g. C: to mean a local file location rather than the - -- net host C. Unfortunatly this not common to all tar on Windows, - -- so we first try to untar with the --force-local, and if that - -- fails, we retry without --force-local. + -- net host C. Unfortunately this not common to all tar on + -- Windows, so we first try to untar with the --force-local, and + -- if that fails, we retry without --force-local. declare begin diff --git a/src/alire/alire-origins-deployers-system.ads b/src/alire/alire-origins-deployers-system.ads index 672026f9..2be0ee58 100644 --- a/src/alire/alire-origins-deployers-system.ads +++ b/src/alire/alire-origins-deployers-system.ads @@ -44,7 +44,7 @@ package Alire.Origins.Deployers.System is procedure Dont_Ask_Permission (This : in out Deployer); -- This procedure tells the deployer not to ask user permission before - -- deployement. + -- deployment. ------------- -- Factory -- diff --git a/src/alire/alire-origins-deployers.adb b/src/alire/alire-origins-deployers.adb index f520ebad..19908427 100644 --- a/src/alire/alire-origins-deployers.adb +++ b/src/alire/alire-origins-deployers.adb @@ -17,7 +17,7 @@ package body Alire.Origins.Deployers is function Compute_Hash (This : Deployer; Folder : String; Kind : Hashes.Kinds) return Hashes.Any_Digest is - (raise Program_Error with "Should not be called unless overriden"); + (raise Program_Error with "Should not be called unless overridden"); ------------------ -- New_Deployer -- diff --git a/src/alire/alire-origins-deployers.ads b/src/alire/alire-origins-deployers.ads index dab1943d..8fe0cf1c 100644 --- a/src/alire/alire-origins-deployers.ads +++ b/src/alire/alire-origins-deployers.ads @@ -48,7 +48,7 @@ package Alire.Origins.Deployers is Kind : Hashes.Kinds) return Hashes.Any_Digest with Pre'Class => This.Supports_Hashing or else raise Program_Error; -- Called immediately after Fetch for each hash in the origin, Should - -- be overriden by all deployers that support hashing; it won't be called + -- be overridden by all deployers that support hashing; it won't be called -- otherwise. This function may raise exceptions that will be properly -- dealt with in the classwide Deploy. diff --git a/src/alire/alire-origins.ads b/src/alire/alire-origins.ads index 27673a4a..881a46cd 100644 --- a/src/alire/alire-origins.ads +++ b/src/alire/alire-origins.ads @@ -128,7 +128,7 @@ package Alire.Origins with Preelaborate is Parent : TOML_Adapters.Key_Queue := TOML_Adapters.Empty_Queue; Hashed : Boolean := True) return Outcome; - -- Parse a string and dispatch to the appropiate constructor. + -- Parse a string and dispatch to the appropriate constructor. -- Parent is an optional parent TOML table that may contain extra fields -- (e.g., source_archive in case of an https: origin). -- Hashed indicates if integrity hashes are expected, so this function can diff --git a/src/alire/alire-os_lib-subprocess.ads b/src/alire/alire-os_lib-subprocess.ads index a85160d1..d8225650 100644 --- a/src/alire/alire-os_lib-subprocess.ads +++ b/src/alire/alire-os_lib-subprocess.ads @@ -11,7 +11,8 @@ package Alire.OS_Lib.Subprocess is (Command : String; Arguments : Utils.String_Vector; Understands_Verbose : Boolean := False); - -- Either suceeds or raises Checked_Error with the code and output as info. + -- Either succeeds or raises Checked_Error with the code and output as + -- info. type Code_Array is array (Positive range <>) of Integer; -- An array of exit codes that won't cause the following calls to raise @@ -22,9 +23,9 @@ package Alire.OS_Lib.Subprocess is Understands_Verbose : Boolean := False; Err_To_Out : Boolean := False; Valid_Exit_Codes : Code_Array := (1 => 0)) return Utils.String_Vector; - -- Either suceeds or raises Checked_Error with the code and output as info. - -- Output is captured and returned on success. The exit code is checked - -- against the Valid_Exit_Codes. + -- Either succeeds or raises Checked_Error with the code and output as + -- info. Output is captured and returned on success. The exit code is + -- checked against the Valid_Exit_Codes. function Unchecked_Spawn_And_Capture (Command : String; diff --git a/src/alire/alire-paths.ads b/src/alire/alire-paths.ads index fccc6ff1..6a9895ba 100644 --- a/src/alire/alire-paths.ads +++ b/src/alire/alire-paths.ads @@ -3,7 +3,7 @@ with Alire.OS_Lib; use Alire.OS_Lib.Operators; package Alire.Paths with Preelaborate is Crate_File_Extension_With_Dot : constant String; - -- Until we decide a name, going to use crate per Amiard's suggesion + -- Until we decide a name, going to use crate per Amiard's suggestion Working_Folder_Inside_Root : constant Relative_Path; -- This is the folder inside a crate where all alire products are created diff --git a/src/alire/alire-releases.ads b/src/alire/alire-releases.ads index c759d9b1..48793847 100644 --- a/src/alire/alire-releases.ads +++ b/src/alire/alire-releases.ads @@ -171,7 +171,7 @@ package Alire.Releases with Preelaborate is function Executables (R : Release; P : Alire.Properties.Vector) return Utils.String_Vector; - -- Only explicity declared ones + -- Only explicitly declared ones -- Under some conditions (usually current platform) function Project_Paths (R : Release; diff --git a/src/alire/alire-solver.adb b/src/alire/alire-solver.adb index 459f50c7..62f448ef 100644 --- a/src/alire/alire-solver.adb +++ b/src/alire/alire-solver.adb @@ -556,7 +556,7 @@ package body Alire.Solver is Trace.Debug ("SOLVER: dependency HINTED: " & (+Dep.Crate) & " via EXTERNAL to satisfy " & Dep.Image & - " withouth adding dependencies to tree " & + " without adding dependencies to tree " & Tree'(Expanded and Current and Remaining).Image_One_Line); diff --git a/src/alire/alire-toml_expressions-cases.ads b/src/alire/alire-toml_expressions-cases.ads index 952b84fc..83be6f4a 100644 --- a/src/alire/alire-toml_expressions-cases.ads +++ b/src/alire/alire-toml_expressions-cases.ads @@ -14,7 +14,7 @@ package Alire.TOML_Expressions.Cases with Preelaborate is Loader : Static_Loader) return Conditional.Properties; -- Expects a "key = from" table. - -- To be used during resolution of a dynamic property expresion. Only a + -- To be used during resolution of a dynamic property expression. Only a -- particular property static value is accepted when in an expr -- (because the syntax is key.expr.values, and not expr.key.values, so -- key and values must agree). We explicitly pass a Loader for the property diff --git a/src/alire/alire-toml_expressions.ads b/src/alire/alire-toml_expressions.ads index 28c98e63..3f59ca0d 100644 --- a/src/alire/alire-toml_expressions.ads +++ b/src/alire/alire-toml_expressions.ads @@ -112,7 +112,7 @@ package Alire.TOML_Expressions with Preelaborate is From : TOML_Adapters.Key_Queue; Static_Loader : Static_Tree_Loader) return Tree; -- Entry point into loading expression trees. Identifies case(xx) - -- expressions, which are recursivley loaded using the Loaders, or using + -- expressions, which are recursively loaded using the Loaders, or using -- Static_Loader for final values. Parent is the "key" being loaded. -- From points to the RHS value or case expr May raise Checked_Error. diff --git a/src/alire/alire-utils-tools.ads b/src/alire/alire-utils-tools.ads index c4c184a2..dad880b2 100644 --- a/src/alire/alire-utils-tools.ads +++ b/src/alire/alire-utils-tools.ads @@ -3,7 +3,7 @@ package Alire.Utils.Tools is type Tool_Kind is (Git, Tar, Unzip, Curl, Mercurial, Subversion); procedure Check_Tool (Tool : Tool_Kind); - -- Check if a required exectuable tool is available in PATH. + -- Check if a required executable tool is available in PATH. -- If not, try to install it or abort. end Alire.Utils.Tools; diff --git a/src/alire/alire-utils.ads b/src/alire/alire-utils.ads index bc56cf3d..77ecfc66 100644 --- a/src/alire/alire-utils.ads +++ b/src/alire/alire-utils.ads @@ -18,11 +18,11 @@ package Alire.Utils with Preelaborate is With_Name : Boolean) return Boolean; -- Minimally check that a string could be an email. Since well-formed -- emails can be perfectly fake, we don't make this exceptionally - -- foolprof. Complete regexps for email-compliant addresses are not + -- foolproof. Complete regexps for email-compliant addresses are not -- trivial (see RFC 5322). We settle for the following: "a@b.c", -- where a can be anything printable but whitespace. b, c, can be -- alphanumeric and hyphens, not starting/ending with the latter - -- (https://en.wikipedia.org/wiki/Domain_name). Additionaly, if With_Name, + -- (https://en.wikipedia.org/wiki/Domain_name). Additionally, if With_Name, -- the email can be enclosed in "<...>", with anything before it a -- plaintext name. diff --git a/src/alr/alr-commands-setenv.adb b/src/alr/alr-commands-setenv.adb index c3fb0cfa..bd45b598 100644 --- a/src/alr/alr-commands-setenv.adb +++ b/src/alr/alr-commands-setenv.adb @@ -36,8 +36,8 @@ package body Alr.Commands.Setenv is return Alire.Utils.String_Vector is (Alire.Utils.Empty_Vector .Append ("Print the environment variables used to build the crate." & - " This command can be used to setup a build enviroment, for" & - " instance before starting an IDE")); + " This command can be used to setup a build environment," & + " for instance before starting an IDE")); -------------------- -- Setup_Switches -- diff --git a/src/alr/alr-commands-withing.adb b/src/alr/alr-commands-withing.adb index 7ee555eb..d4dd9f62 100644 --- a/src/alr/alr-commands-withing.adb +++ b/src/alr/alr-commands-withing.adb @@ -348,7 +348,7 @@ package body Alr.Commands.Withing is Requires_Full_Index; From; else - raise Program_Error with "List should have already happended"; + raise Program_Error with "List should have already happened"; end if; exception when E : Constraint_Error => diff --git a/src/alr/alr-commands.ads b/src/alr/alr-commands.ads index cb429d30..f6072ecd 100644 --- a/src/alr/alr-commands.ads +++ b/src/alr/alr-commands.ads @@ -37,7 +37,7 @@ package Alr.Commands is -- is provided by Short_Description (see below). -- -- 2. USAGE, "alr [global options] command [command options]" & [args text] - -- [args text] is provided by Usage_Custom_Paramenters (see below). + -- [args text] is provided by Usage_Custom_Parameters (see below). -- -- 3. GLOBAL OPTIONS explanation. -- Autogenerated by GNAT.Command_Line. diff --git a/src/alr/alr-paths.ads b/src/alr/alr-paths.ads index 978a2135..8aca870d 100644 --- a/src/alr/alr-paths.ads +++ b/src/alr/alr-paths.ads @@ -47,7 +47,7 @@ package Alr.Paths is function Alr_Source_Folder return Absolute_Path; -- Folder inside Alr_Config_Folder containing a clone of the alr repo - -- This folder can be overriden via environment variable + -- This folder can be overridden via environment variable -- Alire.Environment.Source. Alr_Working_Folder : constant Relative_Path; diff --git a/src/alr/os_windows/alr-platforms-windows.adb b/src/alr/os_windows/alr-platforms-windows.adb index db3bbbb1..77249a06 100644 --- a/src/alr/os_windows/alr-platforms-windows.adb +++ b/src/alr/os_windows/alr-platforms-windows.adb @@ -17,7 +17,7 @@ package body Alr.Platforms.Windows is Msys2_Installer_URL : constant String := "http://repo.msys2.org/distrib/" & Msys2_Installer; - -- FIXME, temporary address for developement + -- FIXME, temporary address for development Msys2_Installer_Script : constant String := "auto-install.js"; Msys2_Installer_Script_URL : constant String := "https://raw.githubusercontent.com/Fabien-Chouteau/" & @@ -170,7 +170,7 @@ package body Alr.Platforms.Windows is end if; end if; - -- Set the PATH and other enviroment variable for msys2 + -- Set the PATH and other environment variable for msys2 Set_Msys2_Env (Install_Dir); end Setup_Msys2; -- 2.39.5