From 5755a5c354c8b622fae14a32b9f8f6f901fb9529 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 9 Jul 2012 11:33:38 -0400 Subject: [PATCH] Install a nix.conf manpage --- doc/manual/Makefile.am | 2 ++ doc/manual/conf-file.xml | 32 +++++++++++++++++++++----------- doc/manual/manual.xml | 6 +++++- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am index 33cb27e05..42da3c8b0 100644 --- a/doc/manual/Makefile.am +++ b/doc/manual/Makefile.am @@ -21,6 +21,8 @@ man1_MANS = nix-env.1 nix-build.1 nix-store.1 nix-instantiate.1 \ nix-prefetch-url.1 nix-channel.1 \ nix-install-package.1 nix-hash.1 nix-copy-closure.1 +man5_MANS = nix.conf.5 + man8_MANS = nix-worker.8 FIGURES = figures/user-environments.png diff --git a/doc/manual/conf-file.xml b/doc/manual/conf-file.xml index 25a009de9..7fd104eb4 100644 --- a/doc/manual/conf-file.xml +++ b/doc/manual/conf-file.xml @@ -1,27 +1,36 @@ -
+ -Nix configuration file + + nix.conf + 5 + Nix + + + + nix.conf + Nix configuration file + + +Description A number of persistent settings of Nix are stored in the file sysconfdir/nix/nix.conf. This file is a list of name = value pairs, one per line. -Comments start with a # character. An example -configuration file is shown in . - -Nix configuration file +Comments start with a # character. Here is an example +configuration file: gc-keep-outputs = true # Nice for developers gc-keep-derivations = true # Idem env-keep-derivations = false - -The following variables are currently available: +The following settings are currently available: @@ -323,5 +332,6 @@ build-use-chroot = /dev /proc /bin + -
+ diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml index 95fbe7d90..ccff9423c 100644 --- a/doc/manual/manual.xml +++ b/doc/manual/manual.xml @@ -40,7 +40,6 @@ Command Reference -
Main commands @@ -63,6 +62,11 @@
+
+ Files + +
+