about summary refs log tree commit diff
path: root/doc/manual
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2012-08-26T18·48-0400
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-08-29T22·07-0400
commit360056e174db2171c47e065ae1e5f58ccee0236f (patch)
tree01d5492cb6479406808dcafccd5682b99ba78218 /doc/manual
parentf7b650d234dffd72b2c70ee25d9e333d433feba6 (diff)
Document importing from a directory in the import documentation
Diffstat (limited to 'doc/manual')
-rw-r--r--doc/manual/builtins.xml6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/manual/builtins.xml b/doc/manual/builtins.xml
index ce68c45bf366..64d4e13ad997 100644
--- a/doc/manual/builtins.xml
+++ b/doc/manual/builtins.xml
@@ -275,8 +275,10 @@ stdenv.mkDerivation {
   <replaceable>path</replaceable></term>
 
     <listitem><para>Load, parse and return the Nix expression in the
-    file <replaceable>path</replaceable>.  Evaluation aborts if the
-    file doesn’t exist or contains an incorrect Nix
+    file <replaceable>path</replaceable>.  If <replaceable>path
+    </replaceable> is a directory, the file <filename>default.nix
+    </filename> in that directory is loaded.  Evaluation aborts if
+    the file doesn’t exist or contains an incorrect Nix
     expression.  <function>import</function> implements Nix’s module
     system: you can put any Nix expression (such as an attribute set
     or a function) in a separate file, and use it from Nix expressions