Skip to content

Commit 97484d8

Browse files
authored
Merge pull request #5856 from ggreif/typos
Typofixes in comments and docs
2 parents 8e90301 + 3574375 commit 97484d8

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

Cabal/ChangeLog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@
434434
* Experimental support for emitting DWARF debug info.
435435
* Preliminary support for relocatable packages.
436436
* Allow cabal to be used inside cabal exec enviroments.
437-
* hpc: support mutliple "ways" (e.g. profiling and vanilla).
437+
* hpc: support multiple "ways" (e.g. profiling and vanilla).
438438
* Support GHCJS.
439439
* Improved command line documentation.
440440
* Add `-none` constraint syntax for version ranges (#2093).

Cabal/Distribution/Compat/Prelude.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
-- | This module does two things:
1717
--
18-
-- * Acts as a compatiblity layer, like @base-compat@.
18+
-- * Acts as a compatibility layer, like @base-compat@.
1919
--
2020
-- * Provides commonly used imports.
2121
module Distribution.Compat.Prelude (

Cabal/doc/developing-packages.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2259,7 +2259,7 @@ system-dependent values for these fields.
22592259

22602260
.. _buildtoolsbc:
22612261

2262-
**Backward Compatiblity**
2262+
**Backward Compatibility**
22632263

22642264
Although this field is deprecated in favor of :pkg-field:`build-tool-depends`, there are some situations where you may prefer to use :pkg-field:`build-tools` in cases (1) and (2), as it is supported by more versions of Cabal.
22652265
In case (3), :pkg-field:`build-tool-depends` is better for backwards-compatibility, as it will be ignored by old versions of Cabal; if you add the executable to :pkg-field:`build-tools`, a setup script built against old Cabal will choke.

Cabal/doc/nix-local-build.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1541,7 +1541,7 @@ Static linking options
15411541
:default: False
15421542

15431543
Roll this and all dependent libraries into a combined ``.a`` archive.
1544-
This uses GHCs ``-staticlib`` flag, which is avaiable for iOS and with
1544+
This uses GHCs ``-staticlib`` flag, which is available for iOS and with
15451545
GHC 8.4 and later for other platforms as well.
15461546

15471547
Foreign function interface options

cabal-install/Distribution/Client/Compat/Prelude.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
-- | This module does two things:
55
--
6-
-- * Acts as a compatiblity layer, like @base-compat@.
6+
-- * Acts as a compatibility layer, like @base-compat@.
77
--
88
-- * Provides commonly used imports.
99
--

cabal-install/Distribution/Client/ProjectPlanning.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,7 @@ planPackages verbosity comp platform solver SolverSettings{..}
10711071
-- current and past compilers; in fact recent lib:Cabal versions
10721072
-- will warn when they encounter a too new or unknown GHC compiler
10731073
-- version (c.f. #415). To avoid running into unsupported
1074-
-- configurations we encode the compatiblity matrix as lower
1074+
-- configurations we encode the compatibility matrix as lower
10751075
-- bounds on lib:Cabal here (effectively corresponding to the
10761076
-- respective major Cabal version bundled with the respective GHC
10771077
-- release).

cabal-install/Distribution/Solver/Compat/Prelude.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
-- | This module does two things:
55
--
6-
-- * Acts as a compatiblity layer, like @base-compat@.
6+
-- * Acts as a compatibility layer, like @base-compat@.
77
--
88
-- * Provides commonly used imports.
99
--

cabal-install/tests/UnitTests/Distribution/Client/InstallPlan.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ arbitraryInstallPlan mkIPkg mkSrcPkg ipkgProportion graph = do
245245
-- It generates a DAG based on ranks of nodes. Nodes in each rank can only
246246
-- have edges to nodes in subsequent ranks.
247247
--
248-
-- The generator is paramterised by a generator for the number of ranks and
249-
-- the number of nodes within each rank. It is also paramterised by the
248+
-- The generator is parametrised by a generator for the number of ranks and
249+
-- the number of nodes within each rank. It is also parametrised by the
250250
-- chance that each node in each rank will have an edge from each node in
251251
-- each previous rank. Thus a higher chance will produce a more densely
252252
-- connected graph.

0 commit comments

Comments
 (0)