aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/manual/src/glossary.md9
-rw-r--r--src/libstore/globals.hh8
2 files changed, 10 insertions, 7 deletions
diff --git a/doc/manual/src/glossary.md b/doc/manual/src/glossary.md
index 7ba595ba0..6bf041e7c 100644
--- a/doc/manual/src/glossary.md
+++ b/doc/manual/src/glossary.md
@@ -75,13 +75,8 @@
- [substituter]{#gloss-substituter}\
A *substituter* is an additional store from which Nix will
- copy store objects it doesn't have. Nix will copy a store
- path from a remote store only if one of the following is true:
-
- - the store object is signed by one of the `trusted-public-keys`
- - the substituter is in the `trusted-substituters` list
- - the `no-require-sigs` option has been set to disable signature checking
- - the store object is [output-addressed](#gloss-output-addressed-store-object)
+ copy store objects it doesn't have. For details, see the
+ [`substituters` option](command-ref/conf-file.html#conf-substituters).
- [purity]{#gloss-purity}\
The assumption that equal Nix derivations when run always produce
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index d7f351166..a659036e2 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -613,6 +613,14 @@ public:
are tried based on their Priority value, which each substituter can set
independently. Lower value means higher priority.
The default is `https://cache.nixos.org`, with a Priority of 40.
+
+ Nix will copy a store path from a remote store only if one
+ of the following is true:
+
+ - the store object is signed by one of the `trusted-public-keys`
+ - the substituter is in the `trusted-substituters` list
+ - the `no-require-sigs` option has been set to disable signature checking
+ - the store object is [output-addressed](#gloss-output-addressed-store-object)
)",
{"binary-caches"}};