summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJosef Kemetmüller <josef.kemetmueller@gmail.com>2020-10-21 17:04:36 +0200
committerJosef Kemetmüller <josef.kemetmueller@gmail.com>2020-10-21 17:04:36 +0200
commit7f60f48e1aed14680eaf05154abf243ea764bf85 (patch)
tree4dcd3a17a1e7135082e792b64e2c70c18db1b776 /doc
parentecfebde6ffbf8fa3184a74cb685ec340ee87291a (diff)
Fix the docs about the new NIX_CONFIG env var
This was accidentally documented as NIX_OPTIONS.
Diffstat (limited to 'doc')
-rw-r--r--doc/manual/src/command-ref/conf-file-prefix.md2
-rw-r--r--doc/manual/src/command-ref/env-common.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/manual/src/command-ref/conf-file-prefix.md b/doc/manual/src/command-ref/conf-file-prefix.md
index d38456788..e53a3ddf4 100644
--- a/doc/manual/src/command-ref/conf-file-prefix.md
+++ b/doc/manual/src/command-ref/conf-file-prefix.md
@@ -19,7 +19,7 @@ By default Nix reads settings from the following places:
and `XDG_CONFIG_HOME`. If these are unset, it will look in
`$HOME/.config/nix.conf`.
- - If `NIX_OPTIONS` is set, its contents is treated as the contents of
+ - If `NIX_CONFIG` is set, its contents is treated as the contents of
a configuration file.
The configuration files consist of `name =
diff --git a/doc/manual/src/command-ref/env-common.md b/doc/manual/src/command-ref/env-common.md
index 27e730fc8..c670d82b8 100644
--- a/doc/manual/src/command-ref/env-common.md
+++ b/doc/manual/src/command-ref/env-common.md
@@ -81,7 +81,7 @@ Most Nix commands interpret the following environment variables:
Overrides the location of the system Nix configuration directory
(default `prefix/etc/nix`).
- - `NIX_OPTIONS`
+ - `NIX_CONFIG`
Applies settings from Nix configuration from the environment.
The content is treated as if it was read from a Nix configuration file.
Settings are separated by the newline character.