From 5863987bba9bc4c90d0d71204933ac90ac7a710b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Apr 2012 21:56:20 +0200
Subject: [PATCH] Include environment variables in the manpages

---
 doc/manual/env-common.xml      |  2 +-
 doc/manual/nix-build.xml       |  9 +++++++++
 doc/manual/nix-env.xml         |  8 ++++++++
 doc/manual/nix-instantiate.xml |  9 +++++++++
 doc/manual/nix-store.xml       | 11 ++++++++++-
 5 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/doc/manual/env-common.xml b/doc/manual/env-common.xml
index 99acc59490..f52e2633de 100644
--- a/doc/manual/env-common.xml
+++ b/doc/manual/env-common.xml
@@ -7,7 +7,7 @@
 
 <para>Most Nix commands interpret the following environment variables:</para>
 
-<variablelist>
+<variablelist xml:id="env-common">
 
   
 <varlistentry><term><envar>NIX_IGNORE_SYMLINK_STORE</envar></term>
diff --git a/doc/manual/nix-build.xml b/doc/manual/nix-build.xml
index 1194f2962a..e3508d92ce 100644
--- a/doc/manual/nix-build.xml
+++ b/doc/manual/nix-build.xml
@@ -145,4 +145,13 @@ firefox  firefox-config</screen>
 </refsection>
 
 
+<refsection condition="manpage"><title>Environment variables</title>
+
+<variablelist>
+  <xi:include href="env-common.xml#xmlns(db=http://docbook.org/ns/docbook)xpointer(//db:variablelist[@xml:id='env-common']/*)" />
+</variablelist>
+
+</refsection>
+  
+
 </refentry>
diff --git a/doc/manual/nix-env.xml b/doc/manual/nix-env.xml
index 72c15b0221..cc33ef3bea 100644
--- a/doc/manual/nix-env.xml
+++ b/doc/manual/nix-env.xml
@@ -1254,5 +1254,13 @@ error: no generation older than the current (91) exists</screen>
 </refsection>
 
 
+<refsection condition="manpage"><title>Environment variables</title>
+
+<variablelist>
+  <xi:include href="env-common.xml#xmlns(db=http://docbook.org/ns/docbook)xpointer(//db:variablelist[@xml:id='env-common']/*)" />
+</variablelist>
+
+</refsection>
+  
 
 </refentry>
diff --git a/doc/manual/nix-instantiate.xml b/doc/manual/nix-instantiate.xml
index b213535ff5..a659ee7304 100644
--- a/doc/manual/nix-instantiate.xml
+++ b/doc/manual/nix-instantiate.xml
@@ -202,4 +202,13 @@ $ echo 'rec { x = "foo"; y = x; }' | nix-instantiate --eval-only --xml --strict
 </refsection>
 
 
+<refsection condition="manpage"><title>Environment variables</title>
+
+<variablelist>
+  <xi:include href="env-common.xml#xmlns(db=http://docbook.org/ns/docbook)xpointer(//db:variablelist[@xml:id='env-common']/*)" />
+</variablelist>
+
+</refsection>
+  
+
 </refentry>
diff --git a/doc/manual/nix-store.xml b/doc/manual/nix-store.xml
index 0c235c688c..6a4ca3f717 100644
--- a/doc/manual/nix-store.xml
+++ b/doc/manual/nix-store.xml
@@ -1047,7 +1047,7 @@ backups and when migrating to different database schemas.</para>
 
 <!--######################################################################-->
 
-<refsection><title>Operation <option>--dump-db</option></title>
+<refsection><title>Operation <option>--load-db</option></title>
 
 <refsection>
   <title>Synopsis</title>
@@ -1068,4 +1068,13 @@ loads it into the Nix database.</para>
 </refsection>
 
 
+<refsection condition="manpage"><title>Environment variables</title>
+
+<variablelist>
+  <xi:include href="env-common.xml#xmlns(db=http://docbook.org/ns/docbook)xpointer(//db:variablelist[@xml:id='env-common']/*)" />
+</variablelist>
+
+</refsection>
+  
+
 </refentry>