about summary refs log tree commit diff
path: root/doc/manual/manual.xml
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-07-11T22·53-0400
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-07-11T22·53-0400
commit04559a0d45ad02fc760b09132cca0d875af035e5 (patch)
treed7de1301fa9753467781dfc5d931959fcfae34bf /doc/manual/manual.xml
parente4d6bcb6cdc34d204ccf49e137dd5070f664c523 (diff)
parenteae802459d7639a69baec555264f394adad043c0 (diff)
Merge branch 'master' of github.com:NixOS/nix into no-manifests
Diffstat (limited to 'doc/manual/manual.xml')
-rw-r--r--doc/manual/manual.xml6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index 95fbe7d90414..ccff9423cf17 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -40,7 +40,6 @@
     <title>Command Reference</title>
     <xi:include href="opt-common.xml" />
     <xi:include href="env-common.xml" />
-    <xi:include href="conf-file.xml" />
     
     <section>
       <title>Main commands</title>
@@ -63,6 +62,11 @@
       <xi:include href="nix-worker.xml" />
     </section>
 
+    <section>
+      <title>Files</title>
+      <xi:include href="conf-file.xml" />
+    </section>
+    
   </appendix>
 
   <xi:include href="troubleshooting.xml" />