Unverified Commit 97484d8e authored by Mikhail Glushenkov's avatar Mikhail Glushenkov Committed by GitHub

Merge pull request #5856 from ggreif/typos

Typofixes in comments and docs
parents 8e903011 35743758
...@@ -434,7 +434,7 @@ ...@@ -434,7 +434,7 @@
* Experimental support for emitting DWARF debug info. * Experimental support for emitting DWARF debug info.
* Preliminary support for relocatable packages. * Preliminary support for relocatable packages.
* Allow cabal to be used inside cabal exec enviroments. * Allow cabal to be used inside cabal exec enviroments.
* hpc: support mutliple "ways" (e.g. profiling and vanilla). * hpc: support multiple "ways" (e.g. profiling and vanilla).
* Support GHCJS. * Support GHCJS.
* Improved command line documentation. * Improved command line documentation.
* Add `-none` constraint syntax for version ranges (#2093). * Add `-none` constraint syntax for version ranges (#2093).
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
-- | This module does two things: -- | This module does two things:
-- --
-- * Acts as a compatiblity layer, like @base-compat@. -- * Acts as a compatibility layer, like @base-compat@.
-- --
-- * Provides commonly used imports. -- * Provides commonly used imports.
module Distribution.Compat.Prelude ( module Distribution.Compat.Prelude (
......
...@@ -2259,7 +2259,7 @@ system-dependent values for these fields. ...@@ -2259,7 +2259,7 @@ system-dependent values for these fields.
.. _buildtoolsbc: .. _buildtoolsbc:
**Backward Compatiblity** **Backward Compatibility**
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. 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.
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. 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.
......
...@@ -1541,7 +1541,7 @@ Static linking options ...@@ -1541,7 +1541,7 @@ Static linking options
:default: False :default: False
Roll this and all dependent libraries into a combined ``.a`` archive. Roll this and all dependent libraries into a combined ``.a`` archive.
This uses GHCs ``-staticlib`` flag, which is avaiable for iOS and with This uses GHCs ``-staticlib`` flag, which is available for iOS and with
GHC 8.4 and later for other platforms as well. GHC 8.4 and later for other platforms as well.
Foreign function interface options Foreign function interface options
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
-- | This module does two things: -- | This module does two things:
-- --
-- * Acts as a compatiblity layer, like @base-compat@. -- * Acts as a compatibility layer, like @base-compat@.
-- --
-- * Provides commonly used imports. -- * Provides commonly used imports.
-- --
......
...@@ -1071,7 +1071,7 @@ planPackages verbosity comp platform solver SolverSettings{..} ...@@ -1071,7 +1071,7 @@ planPackages verbosity comp platform solver SolverSettings{..}
-- current and past compilers; in fact recent lib:Cabal versions -- current and past compilers; in fact recent lib:Cabal versions
-- will warn when they encounter a too new or unknown GHC compiler -- will warn when they encounter a too new or unknown GHC compiler
-- version (c.f. #415). To avoid running into unsupported -- version (c.f. #415). To avoid running into unsupported
-- configurations we encode the compatiblity matrix as lower -- configurations we encode the compatibility matrix as lower
-- bounds on lib:Cabal here (effectively corresponding to the -- bounds on lib:Cabal here (effectively corresponding to the
-- respective major Cabal version bundled with the respective GHC -- respective major Cabal version bundled with the respective GHC
-- release). -- release).
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
-- | This module does two things: -- | This module does two things:
-- --
-- * Acts as a compatiblity layer, like @base-compat@. -- * Acts as a compatibility layer, like @base-compat@.
-- --
-- * Provides commonly used imports. -- * Provides commonly used imports.
-- --
......
...@@ -245,8 +245,8 @@ arbitraryInstallPlan mkIPkg mkSrcPkg ipkgProportion graph = do ...@@ -245,8 +245,8 @@ arbitraryInstallPlan mkIPkg mkSrcPkg ipkgProportion graph = do
-- It generates a DAG based on ranks of nodes. Nodes in each rank can only -- It generates a DAG based on ranks of nodes. Nodes in each rank can only
-- have edges to nodes in subsequent ranks. -- have edges to nodes in subsequent ranks.
-- --
-- The generator is paramterised by a generator for the number of ranks and -- The generator is parametrised by a generator for the number of ranks and
-- the number of nodes within each rank. It is also paramterised by the -- the number of nodes within each rank. It is also parametrised by the
-- chance that each node in each rank will have an edge from each node in -- chance that each node in each rank will have an edge from each node in
-- each previous rank. Thus a higher chance will produce a more densely -- each previous rank. Thus a higher chance will produce a more densely
-- connected graph. -- connected graph.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment