diff options
| author | John Ericson <git@JohnEricson.me> | 2022-11-25 08:14:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-25 08:14:32 -0500 |
| commit | 26534f141cb52adf0135e86c71628cdef844a57a (patch) | |
| tree | dff8140578d26993973cb8baf334948664b36660 /doc/manual/src/command-ref | |
| parent | 13f2a6f38db44385ae1c7d3d01170149de328abb (diff) | |
| parent | bc9692a6b701fffe25d2e3b1d16f00edd596930f (diff) | |
Merge branch 'master' into indexed-store-path-outputs
Diffstat (limited to 'doc/manual/src/command-ref')
| -rw-r--r-- | doc/manual/src/command-ref/nix-daemon.md | 4 | ||||
| -rw-r--r-- | doc/manual/src/command-ref/nix-store.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/manual/src/command-ref/nix-daemon.md b/doc/manual/src/command-ref/nix-daemon.md index e91cb01dd..04b483be3 100644 --- a/doc/manual/src/command-ref/nix-daemon.md +++ b/doc/manual/src/command-ref/nix-daemon.md @@ -8,6 +8,6 @@ # Description -The Nix daemon is necessary in multi-user Nix installations. It performs -build actions and other operations on the Nix store on behalf of +The Nix daemon is necessary in multi-user Nix installations. It runs +build tasks and other operations on the Nix store on behalf of unprivileged users. diff --git a/doc/manual/src/command-ref/nix-store.md b/doc/manual/src/command-ref/nix-store.md index ecd838e8d..1251888e9 100644 --- a/doc/manual/src/command-ref/nix-store.md +++ b/doc/manual/src/command-ref/nix-store.md @@ -71,7 +71,7 @@ paths. Realisation is a somewhat overloaded term: outputs are already valid, in which case we are done immediately. Otherwise, there may be [substitutes](../glossary.md) that produce the outputs (e.g., by downloading them). Finally, the - outputs can be produced by performing the build action described + outputs can be produced by running the build task described by the derivation. - If the store path is not a derivation, realisation ensures that the |