Merge branch 'stable' into rc/v2.9

Author: mpilgrem

CONTRIBUTING.md

@@ -46,7 +46,7 @@ there is ever a bad change, it can always be rolled back.
 
 Stack's maintainers are long-term contributors to the project. Michael Snoyman
 (@snoyberg) was the founder of Stack, and its initial maintainer - and he has
-added others. Michael's current interests and priorties mean that he is no
+added others. Michael's current interests and priorities mean that he is no
 longer actively involved in adding new features to Stack.
 
 Maintainers are recognized for their contributions including:
@@ -307,7 +307,7 @@ Where `<PATTERN>` is the name of the folder listed in the
 [test/integration/tests/](https://github.com/commercialhaskell/stack/tree/master/test/integration/tests)
 directory.
 
-You may also achieve this through GHCi with tihs command:
+You may also achieve this through GHCi with this command:
 
 ~~~text
 stack ghci stack:stack-integration-test
@@ -341,9 +341,9 @@ This workflow will run if:
 * commits are pushed to these branches: `master`, `stable` and `rc/**`.
 * requested
 
-The workflow has two jobs: `pendantic` and `unit-tests`.
+The workflow has two jobs: `pedantic` and `unit-tests`.
 
-The `pendantic` job runs on `ubuntu` only and builds Stack with the
+The `pedantic` job runs on `ubuntu` only and builds Stack with the
 `--pedantic` flag.
 
 The `unit-tests` job runs on a matrix of operating systems and Stack
@@ -356,7 +356,7 @@ systems. Its 'Cache dependencies on Windows' step caches the same information
 on Windows, but takes into account that a relevant directory is located outside
 of the Stack root.
 
-### Integration-based - `intergration-tests.yml`
+### Integration-based - `integration-tests.yml`
 
 This workflow will run if:
 * there is a pull request
@@ -397,7 +397,7 @@ named artifacts to path `_release`.
 Its step 'Hash and sign assets' makes use of a 'secret' environment variable
 `RELEASE_SIGNING_KEY` established by the owner of the Stack repository. The
 variable contains the private key for the GPG key with ID 0x575159689BEFB442.
-That key is imported into GPG and then used by GPG to create a detached signture
+That key is imported into GPG and then used by GPG to create a detached signature
 for each file.
 
 ### Inactive - `stan.yml`
@@ -408,7 +408,7 @@ workflow does not run. Its intent is to apply Stan to Stack.
 
 ## Slack channel
 
-If you're making deep changes and real-time communcation with the Stack team
+If you're making deep changes and real-time communication with the Stack team
 would be helpful, we have a `#stack-collaborators` Slack channel in the
 Haskell Foundation workspace. To join the workspace, follow this
 [link](https://haskell-foundation.slack.com/join/shared_invite/zt-z45o9x38-8L55P27r12YO0YeEufcO2w#/shared-invite/email).

ChangeLog.md

@@ -175,14 +175,14 @@ Other enhancements:
 * Added `--candidate` flag to `upload` command to upload a package candidate
   rather than publishing the package.
 
-* Error output using `--no-interleaved-output` no longer prepends indentating
+* Error output using `--no-interleaved-output` no longer prepends indenting
   whitespace. This allows emacs compilation-mode and vim quickfix to locate
   and track errors. See
   [#5523](https://github.com/commercialhaskell/stack/pull/5523)
 
 Bug fixes:
 
-* `stack new` now suppports branches other than `master` as default for
+* `stack new` now supports branches other than `master` as default for
   GitHub repositories. See
   [#5422](https://github.com/commercialhaskell/stack/issues/5422)
 
@@ -209,10 +209,12 @@ Hackage-only release:
 **Changes since v2.3.3**
 
 Major changes:
+
 * Add the `snapshot-location-base` yaml configuration option, which allows to
   override the default location of snapshot configuration files. This option
   affects how snapshot synonyms (LTS/Nightly) are expanded to URLs by the
   `pantry` library.
+
 * `docker-network` configuration key added to override docker `--net` arg
 
 Behavior changes:
@@ -258,7 +260,7 @@ Bug fixes:
 * Fix the problem of `stack repl foo:test:bar` failing without a project
   build before that. See
   [#5213](https://github.com/commercialhaskell/stack/issues/5213)
-* Fix `stack sdist` introducing unneded sublibrary syntax when using
+* Fix `stack sdist` introducing unnecessary sublibrary syntax when using
   pvp-bounds. See
   [#5289](https://github.com/commercialhaskell/stack/issues/5289)
 
@@ -299,7 +301,7 @@ Release notes:
     * macOS: https://get.haskellstack.org/stable/osx-x86_64.tar.gz
     * Windows 64-bit: https://get.haskellstack.org/stable/windows-x86_64.zip
 
-  As always, binaries for specific versions are available from the Github
+  As always, binaries for specific versions are available from the GitHub
   releases: https://github.com/commercialhaskell/stack/releases.
 
 **Changes since v2.1.3.1**
@@ -581,7 +583,7 @@ Behavior changes:
 * Interleaved output is now turned on by default, see
   [#4702](https://github.com/commercialhaskell/stack/issues/4702). In
   addition, the `packagename> ` prefix is no longer included in
-  interelaved mode when only building a single target.
+  interleaved mode when only building a single target.
 * The `-fhide-source-paths` GHC option is now enabled by default and
   can be disabled via the `hide-source-paths` configuration option in
   `stack.yaml`. See
@@ -862,7 +864,7 @@ Behavior changes:
   optimizations/laziness. See:
   [#4125](https://github.com/commercialhaskell/stack/issues/4125).
 * Mustache templating is not applied to large files (over 50kb) to
-  avoid performance degredation. See:
+  avoid performance degradation. See:
   [#4133](https://github.com/commercialhaskell/stack/issues/4133).
 * `stack upload` signs the package by default, as documented. `--no-signature`
   turns the signing off.
@@ -898,7 +900,7 @@ Other enhancements:
   This should help with
   [#3510](https://github.com/commercialhaskell/stack/issues/3510).
 * `stack new` now allows template names of the form `username/foo` to
-  download from a user other than `commercialstack` on Github, and can be
+  download from a user other than `commercialstack` on GitHub, and can be
   prefixed with the service `github:`, `gitlab:`, or `bitbucket:`. See
   [#4039](https://github.com/commercialhaskell/stack/issues/4039)
 * Switch to `githash` to include some unmerged bugfixes in `gitrev`
@@ -1009,7 +1011,7 @@ Other enhancements:
   that is compatible (rather than only checking a single one).   This is
   relevant on Linux where different distributions may have different
   combinations of libtinfo 5/6, ncurses 5/6, and gmp 4/5, and will allow
-  simpifying the setup-info metadata YAML for future GHC releases.
+  simplifying the setup-info metadata YAML for future GHC releases.
 * The build progress bar reports names of packages currently building.
 * `stack setup --verbose` causes verbose output of GHC configure process.
   See [#3716](https://github.com/commercialhaskell/stack/issues/3716)
@@ -1481,7 +1483,7 @@ Behavior changes:
 
 * The default package metadata backend has been changed from Git to
   the 01-index.tar.gz file, from the hackage-security project. This is
-  intended to address some download speed issues from Github for
+  intended to address some download speed issues from GitHub for
   people in certain geographic regions. There is now full support for
   checking out specific Cabal file revisions from downloaded tarballs
   as well. If you manually specify a package index with only a Git
@@ -1948,7 +1950,7 @@ Other enhancements:
   [#1620](https://github.com/commercialhaskell/stack/issues/1620)
 * `DESTDIR` is filtered from environment when installing GHC. See
   [#1460](https://github.com/commercialhaskell/stack/issues/1460)
-* `stack haddock` now supports `--hadock-arguments`. See
+* `stack haddock` now supports `--haddock-arguments`. See
   [#2144](https://github.com/commercialhaskell/stack/issues/2144)
 * Signing: warn if GPG_TTY is not set as per `man gpg-agent`
 

doc/GUIDE.md

@@ -467,7 +467,7 @@ We've specified the `acme-missiles` package in the `package.yaml` file (see
 above), but `acme-missiles` is not part of that LTS package set, so building
 failed.
 
-To add `acme-missles` to the available packages, we'll use the `extra-deps` key
+To add `acme-missiles` to the available packages, we'll use the `extra-deps` key
 in the `stack.yaml` file. That key defines extra packages, not present in the
 resolver, that will be needed as dependencies. You can add this like so:
 
@@ -496,7 +496,7 @@ You can also see a
 [list of all available snapshots](https://www.stackage.org/snapshots). You'll
 notice two flavors: LTS (for "Long Term Support") and Nightly. You can read more
 about them on the
-[LTS Haskell Github page](https://github.com/commercialhaskell/lts-haskell#readme).
+[LTS Haskell GitHub page](https://github.com/commercialhaskell/lts-haskell#readme).
 If you're not sure which to use, start with LTS Haskell (which Stack will lean
 towards by default as well).
 
@@ -841,7 +841,7 @@ stack build --pedantic --haddock --test --exec "echo Yay, it succeeded" --file-w
 
 This command will:
 
-* turn on all warnings and errors (the `--pendantic` flag)
+* turn on all warnings and errors (the `--pedantic` flag)
 * build your library and executables
 * generate Haddocks (the `--haddock` flag)
 * build and run your test suite (the `--test` flag)
@@ -952,7 +952,7 @@ end up including the helloworld-test component as well.
 
 You can bypass this implicit adding of components by being much more explicit,
 and stating the components directly. For example, the following will not build
-the `helloworld-exe` executable once all executables have been sucessfully
+the `helloworld-exe` executable once all executables have been successfully
 built:
 
 ~~~text
@@ -1307,7 +1307,7 @@ follows the Unix convention of `--` to separate these. For example, command:
 stack exec --package stm -- echo I installed the stm package via --package stm
 ~~~
 
-yields ouput like:
+yields output like:
 
 ~~~text
 Run from outside a project, using implicit global project config