Skip to content

Commit f234145

Browse files
authored
Merge pull request #3698 from tbroadley/fix-typos
docs: fix typos
2 parents b338401 + 74fc87d commit f234145

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

ChangeLog.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Behavior changes:
6262
* The `package-indices` setting with Hackage no longer works with the
6363
`00-index.tar.gz` tarball, but must use the `01-index.tar.gz` file
6464
to allow revised packages to be found.
65-
* Options passsed via `--ghci-options` are now passed to the end of the
65+
* Options passed via `--ghci-options` are now passed to the end of the
6666
invocation of ghci, instead of the middle. This allows using `+RTS`
6767
without an accompanying `-RTS`.
6868
* When auto-detecting `--ghc-build`, `tinfo6` is now preferred over
@@ -153,7 +153,7 @@ Other enhancements:
153153
* Stack will now try to detect the width of the running terminal
154154
(only on POSIX for the moment) and use that to better display
155155
output messages. Work is ongoing, so some messages will not
156-
be optimal yet. The terminal width can be overriden with the
156+
be optimal yet. The terminal width can be overridden with the
157157
new `--terminal-width` command-line option (this works even on
158158
non-POSIX).
159159
* Passing non local packages as targets to `stack ghci` will now
@@ -427,7 +427,7 @@ Other enhancements:
427427
* The script interpreter will now output error logging. In particular,
428428
this means it will output info about plan construction errors.
429429
([#2879](https://github.com/commercialhaskell/stack/issues/2879))
430-
* `stack ghci` now takes `--flag` and `--ghc-options` again (inadverently
430+
* `stack ghci` now takes `--flag` and `--ghc-options` again (inadvertently
431431
removed in 1.3.0).
432432
([#2986](https://github.com/commercialhaskell/stack/issues/2986))
433433
* `stack exec` now takes `--rts-options` which passes the given arguments inside of
@@ -699,7 +699,7 @@ Other enhancements:
699699
* Parse CLI arguments and configuration files into less permissive types,
700700
improving error messages for bad inputs.
701701
[#2267](https://github.com/commercialhaskell/stack/issues/2267)
702-
* Add the ability to explictly specify a gcc executable.
702+
* Add the ability to explicitly specify a gcc executable.
703703
[#593](https://github.com/commercialhaskell/stack/issues/593)
704704
* Nix: No longer uses LTS mirroring in nixpkgs. Gives to nix-shell a derivation
705705
like `haskell.compiler.ghc801`
@@ -1106,7 +1106,7 @@ Other enhancements:
11061106
[docs](http://docs.haskellstack.org/en/stable/yaml_configuration/#image)
11071107
- Specify which executables to include in images for `stack image container`
11081108
[docs](http://docs.haskellstack.org/en/stable/yaml_configuration/#image)
1109-
- Docker: pass supplemantary groups and umask into container
1109+
- Docker: pass supplementary groups and umask into container
11101110
- If git fetch fails wipe the directory and try again from scratch
11111111
[#1418](https://github.com/commercialhaskell/stack/issues/1418)
11121112
- Warn if newly installed executables won't be available on the PATH
@@ -1165,7 +1165,7 @@ Enhancements:
11651165
profiling, but instead of generating a report for `--bench` and
11661166
`--test`, prints out a stack trace on exception. Great for using
11671167
like `stack build --test --trace`
1168-
* Nix: all options can be overriden on command line
1168+
* Nix: all options can be overridden on command line
11691169
[#1483](https://github.com/commercialhaskell/stack/issues/1483)
11701170
* Nix: build environments (shells) are now pure by default.
11711171
* Make verbosity silent by default in script interpreter mode
@@ -1278,7 +1278,7 @@ Bug fixes:
12781278
[#1401](https://github.com/commercialhaskell/stack/issues/1401)
12791279
* GHCi: cpp-options in cabal files weren't used
12801280
[#1419](https://github.com/commercialhaskell/stack/issues/1419)
1281-
* Benchmarks couldn't be run independently of eachother
1281+
* Benchmarks couldn't be run independently of each other
12821282
[#1412](https://github.com/commercialhaskell/stack/issues/1412)
12831283
* Send output of building setup to stderr
12841284
[#1410](https://github.com/commercialhaskell/stack/issues/1410)
@@ -1465,7 +1465,7 @@ Other enhancements:
14651465

14661466
* Added the `--docker-env` argument, to set environment variables in Docker container.
14671467
* Set locale environment variables to UTF-8 encoding for builds to avoid "commitBuffer: invalid argument" errors from GHC [#793](https://github.com/commercialhaskell/stack/issues/793)
1468-
* Enable translitation for encoding on stdout and stderr [#824](https://github.com/commercialhaskell/stack/issues/824)
1468+
* Enable transliteration for encoding on stdout and stderr [#824](https://github.com/commercialhaskell/stack/issues/824)
14691469
* By default, `stack upgrade` automatically installs GHC as necessary [#797](https://github.com/commercialhaskell/stack/issues/797)
14701470
* Added the `ghc-options` field to stack.yaml [#796](https://github.com/commercialhaskell/stack/issues/796)
14711471
* Added the `extra-path` field to stack.yaml

doc/MAINTAINER_GUIDE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ consistent and clean stack version.
9090

9191
* Create a
9292
[new draft Github release](https://github.com/commercialhaskell/stack/releases/new)
93-
with tag and name `vX.Y.Z` (where X.Y.Z is the stack package's version), targetting the
93+
with tag and name `vX.Y.Z` (where X.Y.Z is the stack package's version), targeting the
9494
RC branch
9595

9696
* On each machine you'll be releasing from, set environment variables:
@@ -295,7 +295,7 @@ the shell.
295295

296296
### Install clang+llvm
297297

298-
NOTE: the Debian jessie `llvm` packge does not work (executables built with it
298+
NOTE: the Debian jessie `llvm` package does not work (executables built with it
299299
just exit with "schedule: re-entered unsafely.").
300300

301301
The version of LLVM needed depends on the version of GHC you need.

doc/faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ If you are using a powershell session, it is easy to automate even that step:
393393
394394
$env:Path = ( stack setup | %{ $_ -replace '[^ ]+ ', ''} ), $env:Path -join ";"
395395
396-
## How do I reset / remove Stack (such as to to do a completely fresh build)?
396+
## How do I reset / remove Stack (such as to do a completely fresh build)?
397397
398398
The first thing to remove is project-specific `.stack-work` directory within
399399
the project's directory. Next, remove `~/.stack` directory overall. You may

doc/ghcjs.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ You can also build existing stack projects which target GHC, and instead build
1212
them with GHCJS. For example: `stack build --compiler ghcjs-0.2.0.9006020_ghc-7.10.3`
1313

1414
There are advanced options for `stack setup`: `--ghcjs-boot-options` (one word at a time) and `--[no-]ghcjs-boot-clean`
15-
which will passyour settings down to the `ghcjs-boot`. You will need to know exacty what you are doing with them.
15+
which will pass your settings down to the `ghcjs-boot`. You will need to know exactly what you are doing with them.
1616

1717
Sidenote: If you receive a message like
1818
`The program 'ghcjs' version >=0.1 is required but the version of .../ghcjs could not be determined.`,
@@ -56,9 +56,9 @@ setup-info:
5656
sha1: d2cfc25f9cda32a25a87d9af68891b2186ee52f9
5757
```
5858
The later can be generated via: https://github.com/tolysz/prepare-ghcjs
59-
the fromer is a bit more manual. Those bundles are only tested against the latest `node-7.4.0`.
59+
the former is a bit more manual. Those bundles are only tested against the latest `node-7.4.0`.
6060

61-
In order to corrrectly boot and use ghcjs, one might need to install `alex` `happy` `hscolour` `hsc2hs` with the normal ghc.
61+
In order to correctly boot and use ghcjs, one might need to install `alex` `happy` `hscolour` `hsc2hs` with the normal ghc.
6262

6363
Older resolvers:
6464

doc/nix_integration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ etc) should be available. If they are not, it should be because the file
3535
located at `$HOME/.nix-profile/etc/profile.d/nix.sh` is not sourced by your shell.
3636

3737
You should either run `source ~/.nix-profile/etc/profile.d/nix.sh` manually
38-
everytime you open a terminal and need Nix or add this command to your
38+
every time you open a terminal and need Nix or add this command to your
3939
`~/.bashrc` or `~/.bash_profile`.
4040

4141
### Additions to your `stack.yaml`

doc/yaml_configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ automatically promote it to a local package (much like setting a
537537
custom package flag). However, setting options via `$everything` on all flags
538538
will not do so (see
539539
[Github discussion](https://github.com/commercialhaskell/stack/issues/849#issuecomment-320892095)
540-
for reasoning). This can lead to unpredicable behavior by affecting
540+
for reasoning). This can lead to unpredictable behavior by affecting
541541
your snapshot packages.
542542

543543
The behavior of the `$locals`, `$targets`, and `$everything` special

0 commit comments

Comments
 (0)