Skip to content

Commit f1c9ee0

Browse files
authored
Merge pull request NixOS#5480 from rex4539/typos
Fix typos
2 parents 133905b + c34cc5e commit f1c9ee0

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

doc/manual/src/command-ref/nix-env.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ of a derivation `x` by looking at their respective `name` attributes.
401401
The names (e.g., `gcc-3.3.1` are split into two parts: the package name
402402
(`gcc`), and the version (`3.3.1`). The version part starts after the
403403
first dash not followed by a letter. `x` is considered an upgrade of `y`
404-
if their package names match, and the version of `y` is higher that that
404+
if their package names match, and the version of `y` is higher than that
405405
of `x`.
406406

407407
The versions are compared by splitting them into contiguous components

doc/manual/src/command-ref/nix-store.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Special exit codes:
125125

126126
- `104`\
127127
Not deterministic, the build succeeded in check mode but the
128-
resulting output is not binary reproducable.
128+
resulting output is not binary reproducible.
129129

130130
With the `--keep-going` flag it's possible for multiple failures to
131131
occur, in this case the 1xx status codes are or combined using binary

doc/manual/src/contributing/cli-guideline.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Goals
44

55
Purpose of this document is to provide a clear direction to **help design
6-
delightful command line** experience. This document contain guidelines to
6+
delightful command line** experience. This document contains guidelines to
77
follow to ensure a consistent and approachable user experience.
88

99
## Overview
@@ -115,7 +115,7 @@ The rules are:
115115

116116
- Help is shown by using `--help` or `help` command (eg `nix` `--``help` or
117117
`nix help`).
118-
- For non-COMMANDs (eg. `nix` `--``help` and `nix store` `--``help`) we **show
118+
- For non-COMMANDs (eg. `nix` `--``help` and `nix store` `--``help`) we **show
119119
a summary** of most common use cases. Summary is presented on the STDOUT
120120
without any use of PAGER.
121121
- For COMMANDs (eg. `nix init` `--``help` or `nix help init`) we display the
@@ -230,8 +230,8 @@ Now **Learn** part of the output is where you educate users. You should only
230230
show it when you know that a build will take some time and not annoy users of
231231
the builds that take only few seconds.
232232
233-
Every feature like this should go though a intensive review and testing to
234-
collect as much a feedback as possible and to fine tune every little detail. If
233+
Every feature like this should go through an intensive review and testing to
234+
collect as much feedback as possible and to fine tune every little detail. If
235235
done right this can be an awesome features beginners and advance users will
236236
love, but if not done perfectly it will annoy users and leave bad impression.
237237
@@ -272,11 +272,11 @@ not know which `ARGUMENTS` and `OPTIONS` are required or which values are
272272
possible for those options.
273273
274274
In cases, the user might not provide the input or they provide wrong input,
275-
rather then show the error, prompt a user with an option to find and select
275+
rather than show the error, prompt a user with an option to find and select
276276
correct input (see examples).
277277
278278
Prompting is of course not required when TTY is not attached to STDIN. This
279-
would mean that scripts wont need to handle prompt, but rather handle errors.
279+
would mean that scripts won't need to handle prompt, but rather handle errors.
280280
281281
A place to use prompt and provide user with interactive select
282282
@@ -300,7 +300,7 @@ going to happen.
300300
```shell
301301
$ nix build --option substitutors https://cache.example.org
302302
------------------------------------------------------------------------
303-
Warning! A security related question need to be answered.
303+
Warning! A security related question needs to be answered.
304304
------------------------------------------------------------------------
305305
The following substitutors will be used to in `my-project`:
306306
- https://cache.example.org
@@ -311,14 +311,14 @@ $ nix build --option substitutors https://cache.example.org
311311
312312
# Output
313313
314-
Terminal output can be quite limiting in many ways. Which should forces us to
314+
Terminal output can be quite limiting in many ways. Which should force us to
315315
think about the experience even more. As with every design the output is a
316316
compromise between being terse and being verbose, between showing help to
317317
beginners and annoying advance users. For this it is important that we know
318318
what are the priorities.
319319
320320
Nix command line should be first and foremost written with beginners in mind.
321-
But users wont stay beginners for long and what was once useful might quickly
321+
But users won't stay beginners for long and what was once useful might quickly
322322
become annoying. There is no golden rule that we can give in this guideline
323323
that would make it easier how to draw a line and find best compromise.
324324
@@ -508,7 +508,7 @@ can, with a few key strokes, be changed into and advance introspection tool.
508508
509509
### Progress
510510
511-
For longer running commands we should provide and overview of the progress.
511+
For longer running commands we should provide and overview the progress.
512512
This is shown best in `nix build` example:
513513
514514
```shell
@@ -553,7 +553,7 @@ going to happen.
553553
```shell
554554
$ nix build --option substitutors https://cache.example.org
555555
------------------------------------------------------------------------
556-
Warning! A security related question need to be answered.
556+
Warning! A security related question needs to be answered.
557557
------------------------------------------------------------------------
558558
The following substitutors will be used to in `my-project`:
559559
- https://cache.example.org

doc/manual/src/expressions/advanced-attributes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ Derivations can declare some infrequently used optional attributes.
237237
- `preferLocalBuild`\
238238
If this attribute is set to `true` and [distributed building is
239239
enabled](../advanced-topics/distributed-builds.md), then, if
240-
possible, the derivaton will be built locally instead of forwarded
240+
possible, the derivation will be built locally instead of forwarded
241241
to a remote machine. This is appropriate for trivial builders
242242
where the cost of doing a download or remote build would exceed
243243
the cost of building locally.

doc/manual/src/expressions/expression-syntax.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ elements (referenced from the figure by number):
2626
called with three arguments: `stdenv`, `fetchurl`, and `perl`. They
2727
are needed to build Hello, but we don't know how to build them here;
2828
that's why they are function arguments. `stdenv` is a package that
29-
is used by almost all Nix Packages packages; it provides a
29+
is used by almost all Nix Packages; it provides a
3030
“standard” environment consisting of the things you would expect
3131
in a basic Unix environment: a C/C++ compiler (GCC, to be precise),
3232
the Bash shell, fundamental Unix tools such as `cp`, `grep`, `tar`,

doc/manual/src/expressions/language-values.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Nix has the following basic data types:
6464
the start of each line. To be precise, it strips from each line a
6565
number of spaces equal to the minimal indentation of the string as a
6666
whole (disregarding the indentation of empty lines). For instance,
67-
the first and second line are indented two space, while the third
67+
the first and second line are indented two spaces, while the third
6868
line is indented four spaces. Thus, two spaces are stripped from
6969
each line, so the resulting string is
7070

doc/manual/src/introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ $ nix-env --install firefox
127127

128128
_could_ cause quite a bit of build activity, as not only Firefox but
129129
also all its dependencies (all the way up to the C library and the
130-
compiler) would have to built, at least if they are not already in the
130+
compiler) would have to be built, at least if they are not already in the
131131
Nix store. This is a _source deployment model_. For most users,
132132
building from source is not very pleasant as it takes far too long.
133133
However, Nix can automatically skip building from source and instead

0 commit comments

Comments
 (0)