Commit 4785ca90 authored by Brian Wignall's avatar Brian Wignall

Fix typos

parent 7587a5fc
......@@ -231,7 +231,7 @@
types (#4701).
* Support for building with Win32 version 2.6 (#4835).
* Change `compilerExtensions` and `ghcOptExtensionMap` to contain
`Maybe Flag`s, since a supported extention can lack a flag (#4443).
`Maybe Flag`s, since a supported extension can lack a flag (#4443).
* Pretty-printing of `.cabal` files is slightly different due to
parser changes. For an example, see
https://mail.haskell.org/pipermail/cabal-devel/2017-December/010414.html.
......@@ -477,7 +477,7 @@
* Support GHC 7.10.
* Experimental support for emitting DWARF debug info.
* Preliminary support for relocatable packages.
* Allow cabal to be used inside cabal exec enviroments.
* Allow cabal to be used inside cabal exec environments.
* hpc: support multiple "ways" (e.g. profiling and vanilla).
* Support GHCJS.
* Improved command line documentation.
......@@ -813,7 +813,7 @@
* It is no longer necessary to run `configure` before `clean` or `sdist`
* Added support for ghc's `-split-objs`
* Initial support for JHC
* Ignore extension fields in `.cabal` files (fields begining with "`x-`")
* Ignore extension fields in `.cabal` files (fields beginning with "`x-`")
* Some changes to command hooks API to improve consistency
* Hugs support improvements
* Added GeneralisedNewtypeDeriving language extension
......
......@@ -71,7 +71,7 @@ type Traversal' s a = Traversal s s a a
type Getting r s a = LensLike (Const r) s s a a
type AGetter s a = LensLike (Const a) s s a a -- this doens't exist in 'lens'
type AGetter s a = LensLike (Const a) s s a a -- this doesn't exist in 'lens'
type ASetter s t a b = LensLike Identity s t a b
type ALens s t a b = LensLike (Pretext a b) s t a b
......
......@@ -47,7 +47,7 @@
-- is obviously invalid specification.
--
-- We can parse 'Fields' like we parse @aeson@ objects, yet we use
-- slighly higher-level API, so we can process unspecified fields,
-- slightly higher-level API, so we can process unspecified fields,
-- to report unknown fields and save custom @x-fields@.
--
module Distribution.FieldGrammar.Parsec (
......
......@@ -47,7 +47,7 @@ fieldName (Section n _ _) = n
fieldAnn :: Field ann -> ann
fieldAnn = nameAnn . fieldName
-- | All transitive descendands of 'Field', including itself.
-- | All transitive descendants of 'Field', including itself.
--
-- /Note:/ the resulting list is never empty.
--
......
......@@ -1051,7 +1051,7 @@ gbuildModDefFiles (GReplFLib _ flib) = foreignLibModDefFile flib
-- In case of 'Nothing', 'Distribution.ModuleName.main' can be assumed.
exeMainModuleName :: Executable -> Maybe ModuleName
exeMainModuleName Executable{buildInfo = bnfo} =
-- GHC honors the last occurence of a module name updated via -main-is
-- GHC honors the last occurrence of a module name updated via -main-is
--
-- Moreover, -main-is when parsed left-to-right can update either
-- the "Main" module name, or the "main" function name, or both,
......@@ -1465,7 +1465,7 @@ gbuild verbosity numJobs pkg_descr lbi bm clbi = do
}
ForeignLibNativeStatic ->
-- this should be caught by buildFLib
-- (and if we do implement tihs, we probably don't even want to call
-- (and if we do implement this, we probably don't even want to call
-- ghc here, but rather Ar.createArLibArchive or something)
cabalBug "static libraries not yet implemented"
ForeignLibTypeUnknown ->
......
......@@ -903,7 +903,7 @@ gbuildModDefFiles (GReplFLib _ flib) = foreignLibModDefFile flib
-- In case of 'Nothing', 'Distribution.ModuleName.main' can be assumed.
exeMainModuleName :: Executable -> Maybe ModuleName
exeMainModuleName Executable{buildInfo = bnfo} =
-- GHC honors the last occurence of a module name updated via -main-is
-- GHC honors the last occurrence of a module name updated via -main-is
--
-- Moreover, -main-is when parsed left-to-right can update either
-- the "Main" module name, or the "main" function name, or both,
......@@ -1311,7 +1311,7 @@ gbuild verbosity numJobs pkg_descr lbi bm clbi = do
}
ForeignLibNativeStatic ->
-- this should be caught by buildFLib
-- (and if we do implement tihs, we probably don't even want to call
-- (and if we do implement this, we probably don't even want to call
-- ghc here, but rather Ar.createArLibArchive or something)
cabalBug "static libraries not yet implemented"
ForeignLibTypeUnknown ->
......
......@@ -83,7 +83,7 @@ data BuildInfo = BuildInfo {
-- and copied and registered together with this library. The
-- logic on how this library is built will have to be encoded in a
-- custom Setup for now. Oherwise cabal would need to lear how to
-- call arbitary library builders.
-- call arbitrary library builders.
extraLibFlavours :: [String], -- ^ Hidden Flag. This set of strings, will be appended to all libraries when
-- copying. E.g. [libHS<name>_<flavour> | flavour <- extraLibFlavours]. This
-- should only be needed in very specific cases, e.g. the `rts` package, where
......
......@@ -129,7 +129,7 @@ data LocalBuildInfo = LocalBuildInfo {
-- In principle, this is supposed to contain the
-- resolved package description, that does not contain
-- any conditionals. However, it MAY NOT contain
-- the description wtih a 'HookedBuildInfo' applied
-- the description with a 'HookedBuildInfo' applied
-- to it; see 'HookedBuildInfo' for the whole sordid saga.
-- As much as possible, Cabal library should avoid using
-- this parameter.
......
......@@ -61,7 +61,7 @@ instance Parsec PkgconfigVersionRange where
-- note: the wildcard is used in some places, e.g
-- http://hackage.haskell.org/package/bindings-libzip-0.10.1/bindings-libzip.cabal
--
-- however, in the presense of alphanumerics etc. lax version parser,
-- however, in the presence of alphanumerics etc. lax version parser,
-- wildcard is ill-specified
parsec = do
......
......@@ -25,7 +25,7 @@ newtype NubList a =
deriving (Eq, Generic, Typeable)
-- NubList assumes that nub retains the list order while removing duplicate
-- elements (keeping the first occurence). Documentation for "Data.List.nub"
-- elements (keeping the first occurrence). Documentation for "Data.List.nub"
-- does not specifically state that ordering is maintained so we will add a test
-- for that to the test suite.
......
......@@ -777,7 +777,7 @@ data KnownExtension =
-- to the type-level.
| TypeInType
-- | Allow recursive (and therefore undecideable) super-class relationships.
-- | Allow recursive (and therefore undecidable) super-class relationships.
| UndecidableSuperClasses
-- | A temporary extension to help library authors check if their
......
......@@ -1340,7 +1340,7 @@ look something like this:
build-depends: foo-internal, base
Internal libraries are also useful for packages that define multiple
executables, but do not define a publically accessible library. Internal
executables, but do not define a publicly accessible library. Internal
libraries are only visible internally in the package (so they can only
be added to the :pkg-field:`build-depends` of same-package libraries,
executables, test suites, etc.) Internal libraries locally shadow any
......@@ -2013,7 +2013,7 @@ system-dependent values for these fields.
**Library Names**
External libraries are identified by the package's name they're
provided by (currently a package can only publically expose its
provided by (currently a package can only publicly expose its
main library compeonent; in future, packages with multiple exposed
public library components will be supported and a syntax for
referring to public sub-libraries will be provided).
......
......@@ -969,7 +969,7 @@ The following settings control the behavior of the dependency solver:
.. cfg-field:: allow-newer: none, all or list of scoped package names (space or comma separated)
--allow-newer, --allow-newer=[none,all,[scope:][^]pkg]
:synopsis: Lift dependencies upper bound constaints.
:synopsis: Lift dependencies upper bound constraints.
:default: ``none``
......@@ -1062,7 +1062,7 @@ The following settings control the behavior of the dependency solver:
.. cfg-field:: allow-older: none, all, list of scoped package names (space or comma separated)
--allow-older, --allow-older=[none,all,[scope:][^]pkg]
:synopsis: Lift dependency lower bound constaints.
:synopsis: Lift dependency lower bound constraints.
:since: 2.0
:default: ``none``
......
......@@ -273,7 +273,7 @@ rebuildTargetsDryRun distDirLayout@DistDirLayout{..} shared =
--
-- The packages are visited in dependency order, starting with packages with no
-- dependencies. The result for each package is accumulated into a 'Map' and
-- returned as the final result. In addition, when visting a package, the
-- returned as the final result. In addition, when visiting a package, the
-- visiting function is passed the results for all the immediate package
-- dependencies. This can be used to propagate information from dependencies.
--
......
......@@ -1421,7 +1421,7 @@ remoteRepoSectionDescr =
--
-- | Parser combinator for simple fields which uses the field type's
-- 'Monoid' instance for combining multiple occurences of the field.
-- 'Monoid' instance for combining multiple occurrences of the field.
monoidField :: Monoid a => String -> (a -> Doc) -> ReadP a a
-> (b -> a) -> (a -> b -> b) -> FieldDescr b
monoidField name showF readF get' set =
......
......@@ -341,7 +341,7 @@ filterIPNs ipns d@(Dependency pn _ _)
-- | Convert condition trees to flagged dependencies. Mutually
-- recursive with 'convBranch'. See 'convBranch' for an explanation
-- of all arguments preceeding the input 'CondTree'.
-- of all arguments preceding the input 'CondTree'.
convCondTree :: Map FlagName Bool -> DependencyReason PN -> PackageDescription -> OS -> Arch -> CompilerInfo -> PN -> FlagInfo ->
Component ->
(a -> BuildInfo) ->
......
......@@ -509,7 +509,7 @@
0.6.2 Duncan Coutts <duncan@haskell.org> Feb 2009
* The upgrade command has been disabled in this release
* The configure and install commands now have consistent behaviour
* Reduce the tendancy to re-install already existing packages
* Reduce the tendency to re-install already existing packages
* The --constraint= flag now works for the install command
* New --preference= flag for soft constraints / version preferences
* Improved bootstrap.sh script, smarter and better error checking
......
......@@ -1410,7 +1410,7 @@ testBuildKeepGoing config = do
expectBuildFailed failure1
_ <- expectPackageConfigured plan1 res1 "q-0.1"
-- With keep-going then we should go on to sucessfully build Q
-- With keep-going then we should go on to successfully build Q
(plan2, res2) <- executePlan
=<< planProject testdir (config `mappend` keepGoing True)
(_, failure2) <- expectPackageFailed plan2 res2 "p-0.1"
......
......@@ -478,7 +478,7 @@ db1 =
]
-- In this example, we _can_ install C and D as independent goals, but we have
-- to pick two diferent versions for B (arbitrarily)
-- to pick two different versions for B (arbitrarily)
db2 :: ExampleDb
db2 = [
Right $ exAv "A" 1 []
......@@ -874,7 +874,7 @@ db14 = [
-- has a setup dependency on D, and D has a regular dependency on C-*. However,
-- version C-1.0 is already available (perhaps it didn't have this setup dep).
-- Thus, we should be able to break this cycle even if we are installing package
-- E, which explictly depends on C-2.0.
-- E, which explicitly depends on C-2.0.
db15 :: ExampleDb
db15 = [
-- First example (real cycle, no solution)
......@@ -1211,7 +1211,7 @@ testIndepGoals4 name =
-- | Test the trace messages that we get when a package refers to an unknown pkg
--
-- TODO: Currently we don't actually test the trace messages, and this particular
-- test still suceeds. The trace can only be verified by hand.
-- test still succeeds. The trace can only be verified by hand.
db21 :: ExampleDb
db21 = [
Right $ exAv "A" 1 [ExAny "B"]
......
......@@ -13,7 +13,7 @@ main = setupAndCabalTest $ do
-- Calling sdist without running configure first makes test fail with:
-- "Exception: Run the 'configure' command first."
-- This is becuase we are calling getPersistBuildConfig
-- This is because we are calling getPersistBuildConfig
configureResult <- setup' "configure" []
sdistResult <- setup' "sdist" []
......
......@@ -5,7 +5,7 @@
#include "dynamicCharacterOperations.h"
/** Initialize a matrix (fill in all values for non-ambiguous chracter transition costs) using a TCM sent in from an outside source. */
/** Initialize a matrix (fill in all values for non-ambiguous character transition costs) using a TCM sent in from an outside source. */
costMatrix_p matrixInit(size_t alphSize, int *tcm);
/** C wrapper for cpp destructor */
......
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