Skip to content

Commit c8f6ce0

Browse files
committed
Merge pull request #1637 from lubomir/fix-typos
Fix typos in documentation
2 parents 4fa47ca + fe60642 commit c8f6ce0

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

doc/MAINTAINER_GUIDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ to go:
2828
due to merges
2929
* In master branch:
3030
* Bump version to next odd second-to-last component
31-
* Add new "unreleased changes" secion in changelog
31+
* Add new "unreleased changes" section in changelog
3232
* Bump to use latest LTS version
3333
* Review documentation for any changes that need to be made
3434
* Search for old Stack version, unstable stack version, and the next

doc/docker_integration.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ otherwise noted.
116116
# the case.
117117
enable: true
118118

119-
# The name of the repository to pull the image from. See the "reposities"
119+
# The name of the repository to pull the image from. See the "repositories"
120120
# section of this document for more information about available repositories.
121121
# If this includes a tag (e.g. "my/image:tag"), that tagged image will be
122122
# used. Without a tag specified, the LTS version slug is added automatically.
@@ -271,7 +271,7 @@ user. For example (from
271271
# Restart the Docker daemon.
272272
sudo service docker restart
273273

274-
You will now need to log out and log in again for the the group addition
274+
You will now need to log out and log in again for the group addition
275275
to take effect.
276276

277277
Note the above has security implications. See [security](#security) for more.
@@ -281,7 +281,7 @@ Security
281281

282282
Having `docker` usable as a non-root user is always a security risk, and will
283283
allow root access to your system. It is also possible to craft a `stack.yaml`
284-
that will run arbitrary commands in an arbirary docker container through that
284+
that will run arbitrary commands in an arbitrary docker container through that
285285
vector, thus a `stack.yaml` could cause stack to run arbitrary commands as root.
286286
While this is a risk, it is not really a greater risk than is posed by the
287287
docker permissions in the first place (for example, if you ever run an unknown
@@ -325,7 +325,7 @@ by default, meaning a process running in the container can connect to
325325
services running on the host, and a server process run within the container
326326
can be accessed from the host without needing to explicitly publish its port.
327327
To run the container with an isolated network, use `--docker-run-args` to pass
328-
a the `--net` argument to `docker-run`. For example:
328+
the `--net` argument to `docker-run`. For example:
329329

330330
stack --docker-run-args='--net=bridge --publish=3000:3000' \
331331
exec some-server

doc/nix_integration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ in your `stack.yaml` will do the same.
145145

146146
## Command-line options
147147

148-
The configuration present in your `stack.yaml` can be overriden on the
148+
The configuration present in your `stack.yaml` can be overridden on the
149149
command-line. See `stack --nix-help` for a list of all Nix options.
150150

151151
## Configuration

doc/travis_ci.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ addons:
8080

8181
Travis apt plugin doesn't yet support installing apt packages dynamically
8282
(https://github.com/travis-ci/travis-ci/issues/4291). That for we need to write
83-
a bit repetetive `.travis.yml`.
83+
a bit repetitive `.travis.yml`.
8484

8585
Also for different GHC versions, you probably want to use different `stack.yaml`
8686
files.

0 commit comments

Comments
 (0)