From 360056e174db2171c47e065ae1e5f58ccee0236f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 26 Aug 2012 14:48:47 -0400
Subject: [PATCH] Document importing from a directory in the import
 documentation

---
 doc/manual/builtins.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/manual/builtins.xml b/doc/manual/builtins.xml
index ce68c45bf3..64d4e13ad9 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