diff --git a/Cabal-tests/tests/ParserTests/regressions/all-upper-bound.check b/Cabal-tests/tests/ParserTests/regressions/all-upper-bound.check index 7e2cfb4a499..ad65af510aa 100644 --- a/Cabal-tests/tests/ParserTests/regressions/all-upper-bound.check +++ b/Cabal-tests/tests/ParserTests/regressions/all-upper-bound.check @@ -3,4 +3,4 @@ On library, these packages miss upper bounds: - alphalib - betalib - deltalib -Please add them. More informations at https://pvp.haskell.org/ +Please add them. There is more information at https://pvp.haskell.org/ diff --git a/Cabal/src/Distribution/PackageDescription/Check.hs b/Cabal/src/Distribution/PackageDescription/Check.hs index 69f7003a9a8..fb3c05a64b6 100644 --- a/Cabal/src/Distribution/PackageDescription/Check.hs +++ b/Cabal/src/Distribution/PackageDescription/Check.hs @@ -832,7 +832,7 @@ checkGlobFile cv ddir title fp = do rs <- runDirFileGlobM po dir parsedGlob return $ checkGlobResult title fp rs --- | Checks for matchless globs and too strict mathching (<2.4 spec). +-- | Checks for matchless globs and too strict matching (<2.4 spec). checkGlobResult :: CabalField -- .cabal field we are checking -> FilePath -- Glob pattern (to show the user diff --git a/Cabal/src/Distribution/PackageDescription/Check/Conditional.hs b/Cabal/src/Distribution/PackageDescription/Check/Conditional.hs index 49356575f7f..2d4963e434a 100644 --- a/Cabal/src/Distribution/PackageDescription/Check/Conditional.hs +++ b/Cabal/src/Distribution/PackageDescription/Check/Conditional.hs @@ -8,7 +8,7 @@ -- Maintainer : cabal-devel@haskell.org -- Portability : portable -- --- Checks on conditional targes (libraries, executables, etc. that are +-- Checks on conditional targets (libraries, executables, etc. that are -- still inside a CondTree and related checks that can only be performed -- here (variables, duplicated modules). module Distribution.PackageDescription.Check.Conditional diff --git a/Cabal/src/Distribution/PackageDescription/Check/Warning.hs b/Cabal/src/Distribution/PackageDescription/Check/Warning.hs index fad3c6a172c..db1e8af7565 100644 --- a/Cabal/src/Distribution/PackageDescription/Check/Warning.hs +++ b/Cabal/src/Distribution/PackageDescription/Check/Warning.hs @@ -396,7 +396,7 @@ ppExplanation (InvalidNameWin pkg) = ++ prettyShow pkg ++ "' is " ++ "invalid on Windows. Many tools need to convert package names to " - ++ "file names so using this name would cause problems." + ++ "file names, so using this name would cause problems." ppExplanation ZPrefix = "Package names with the prefix 'z-' are reserved by Cabal and " ++ "cannot be used." @@ -637,7 +637,7 @@ ppExplanation (DistPoint mfield path) = ++ " points inside the 'dist' " ++ "directory. This is not reliable because the location of this " ++ "directory is configurable by the user (or package manager). In " - ++ "addition the layout of the 'dist' directory is subject to change " + ++ "addition, the layout of the 'dist' directory is subject to change " ++ "in future versions of Cabal." where -- mfiled Nothing -> the path is inside `ghc-options` @@ -841,12 +841,12 @@ ppExplanation (MissingUpperBounds ct names) = ++ separator ++ List.intercalate separator names ++ "\n" - ++ "Please add them. More informations at https://pvp.haskell.org/" + ++ "Please add them. There is more information at https://pvp.haskell.org/" ppExplanation (SuspiciousFlagName invalidFlagNames) = "Suspicious flag names: " ++ unwords invalidFlagNames ++ ". " - ++ "To avoid ambiguity in command line interfaces, flag shouldn't " + ++ "To avoid ambiguity in command line interfaces, a flag shouldn't " ++ "start with a dash. Also for better compatibility, flag names " ++ "shouldn't contain non-ascii characters." ppExplanation (DeclaredUsedFlags declared used) = @@ -887,7 +887,7 @@ ppExplanation (JUnneeded fieldName) = addConditionalExp $ "'" ++ fieldName - ++ ": -j[N]' can make sense for specific user's setup," + ++ ": -j[N]' can make sense for a particular user's setup," ++ " but it is not appropriate for a distributed package." ppExplanation (FDeferTypeErrorsUnneeded fieldName) = addConditionalExp $ @@ -966,7 +966,7 @@ ppExplanation (UnknownDirectory kind dir) = quote (kind ++ ": " ++ dir) ++ " specifies a directory which does not exist." ppExplanation MissingSourceControl = - "When distributing packages it is encouraged to specify source " + "When distributing packages, it is encouraged to specify source " ++ "control information in the .cabal file using one or more " ++ "'source-repository' sections. See the Cabal user guide for " ++ "details." diff --git a/cabal-testsuite/PackageTests/Check/ConfiguredPackage/Paths/DistPoint/cabal.out b/cabal-testsuite/PackageTests/Check/ConfiguredPackage/Paths/DistPoint/cabal.out index 81f9ada5773..477e1108ab3 100644 --- a/cabal-testsuite/PackageTests/Check/ConfiguredPackage/Paths/DistPoint/cabal.out +++ b/cabal-testsuite/PackageTests/Check/ConfiguredPackage/Paths/DistPoint/cabal.out @@ -1,4 +1,4 @@ # cabal check The following errors will cause portability problems on other environments: -Error: 'ghc-options' path 'dist/file' points inside the 'dist' directory. This is not reliable because the location of this directory is configurable by the user (or package manager). In addition the layout of the 'dist' directory is subject to change in future versions of Cabal. +Error: 'ghc-options' path 'dist/file' points inside the 'dist' directory. This is not reliable because the location of this directory is configurable by the user (or package manager). In addition, the layout of the 'dist' directory is subject to change in future versions of Cabal. Error: Hackage would reject this package. diff --git a/cabal-testsuite/PackageTests/Check/NonConfCheck/DevOnlyFlags/ElseCheck/cabal.out b/cabal-testsuite/PackageTests/Check/NonConfCheck/DevOnlyFlags/ElseCheck/cabal.out index 405f3087efb..a5ef963c71f 100644 --- a/cabal-testsuite/PackageTests/Check/NonConfCheck/DevOnlyFlags/ElseCheck/cabal.out +++ b/cabal-testsuite/PackageTests/Check/NonConfCheck/DevOnlyFlags/ElseCheck/cabal.out @@ -1,4 +1,4 @@ # cabal check The following errors will cause portability problems on other environments: -Error: 'ghc-options: -j[N]' can make sense for specific user's setup, but it is not appropriate for a distributed package. Alternatively, if you want to use this, make it conditional based on a Cabal configuration flag (with 'manual: True' and 'default: False') and enable that flag during development. +Error: 'ghc-options: -j[N]' can make sense for a particular user's setup, but it is not appropriate for a distributed package. Alternatively, if you want to use this, make it conditional based on a Cabal configuration flag (with 'manual: True' and 'default: False') and enable that flag during development. Error: Hackage would reject this package. diff --git a/cabal-testsuite/PackageTests/Check/NonConfCheck/DevOnlyFlags/Jn/cabal.out b/cabal-testsuite/PackageTests/Check/NonConfCheck/DevOnlyFlags/Jn/cabal.out index 4024acad24e..b3217c803cf 100644 --- a/cabal-testsuite/PackageTests/Check/NonConfCheck/DevOnlyFlags/Jn/cabal.out +++ b/cabal-testsuite/PackageTests/Check/NonConfCheck/DevOnlyFlags/Jn/cabal.out @@ -1,4 +1,4 @@ # cabal check The following errors will cause portability problems on other environments: -Error: 'ghc-shared-options: -j[N]' can make sense for specific user's setup, but it is not appropriate for a distributed package. Alternatively, if you want to use this, make it conditional based on a Cabal configuration flag (with 'manual: True' and 'default: False') and enable that flag during development. +Error: 'ghc-shared-options: -j[N]' can make sense for a particular user's setup, but it is not appropriate for a distributed package. Alternatively, if you want to use this, make it conditional based on a Cabal configuration flag (with 'manual: True' and 'default: False') and enable that flag during development. Error: Hackage would reject this package. diff --git a/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsInternalSimple/cabal.out b/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsInternalSimple/cabal.out index f62b27ad803..ff21f73f613 100644 --- a/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsInternalSimple/cabal.out +++ b/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsInternalSimple/cabal.out @@ -2,4 +2,4 @@ These warnings may cause trouble when distributing the package: Warning: On executable 'prova', these packages miss upper bounds: - acme-box -Please add them. More informations at https://pvp.haskell.org/ +Please add them. There is more information at https://pvp.haskell.org/ diff --git a/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsLibInt/cabal.out b/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsLibInt/cabal.out index cb35fe0b644..e0821ac6ea5 100644 --- a/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsLibInt/cabal.out +++ b/cabal-testsuite/PackageTests/Check/NonConfCheck/PackageVersionsLibInt/cabal.out @@ -2,4 +2,4 @@ These warnings may cause trouble when distributing the package: Warning: On library 'int-lib', these packages miss upper bounds: - text -Please add them. More informations at https://pvp.haskell.org/ +Please add them. There is more information at https://pvp.haskell.org/ diff --git a/cabal-testsuite/PackageTests/Check/PackageFiles/VCSInfo/cabal.out b/cabal-testsuite/PackageTests/Check/PackageFiles/VCSInfo/cabal.out index 0b90abdd9d7..b709524c109 100644 --- a/cabal-testsuite/PackageTests/Check/PackageFiles/VCSInfo/cabal.out +++ b/cabal-testsuite/PackageTests/Check/PackageFiles/VCSInfo/cabal.out @@ -1,3 +1,3 @@ # cabal check These warnings will likely cause trouble when distributing the package: -Warning: When distributing packages it is encouraged to specify source control information in the .cabal file using one or more 'source-repository' sections. See the Cabal user guide for details. +Warning: When distributing packages, it is encouraged to specify source control information in the .cabal file using one or more 'source-repository' sections. See the Cabal user guide for details.