about summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2018-02-19T12·58+0100
committerEelco Dolstra <edolstra@gmail.com>2018-02-19T12·58+0100
commit75a1d96cfd931e6e598040f5961d6d33f417ba56 (patch)
treee995eeaf138895275a69a7050507ef9c94f098b4 /doc
parent7fe5910bf8a9d104354df14b6b2faa69a6718e70 (diff)
parentde4934ab3b26aa851b7044e9884102cc054dc092 (diff)
Merge branch 'register-settings' of https://github.com/shlevy/nix
Diffstat (limited to 'doc')
-rw-r--r--doc/manual/command-ref/conf-file.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/manual/command-ref/conf-file.xml b/doc/manual/command-ref/conf-file.xml
index 42906ddff5..c14a4d206b 100644
--- a/doc/manual/command-ref/conf-file.xml
+++ b/doc/manual/command-ref/conf-file.xml
@@ -757,9 +757,10 @@ builtins.fetchurl {
         plugins may construct static instances of RegisterPrimOp to
         add new primops or constants to the expression language,
         RegisterStoreImplementation to add new store implementations,
-        and RegisterCommand to add new subcommands to the
-        <literal>nix</literal> command. See the constructors for those
-        types for more details.
+        RegisterCommand to add new subcommands to the
+        <literal>nix</literal> command, and RegisterSetting to add new
+        nix config settings. See the constructors for those types for
+        more details.
       </para>
       <para>
 	Since these files are loaded into the same address space as