diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-26T19·14-0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-26T19·14-0400 |
| commit | 8c7910083976e255300efa797030448f5a1cb864 (patch) | |
| tree | afbd7a37d0724feb408a2d025364ed3938b5673a /doc | |
| parent | aa115e22df1c80e8878237a9e704d7d70783a243 (diff) | |
| parent | 3a4623afbbc1bff85bde33167d36e8c5a4a3df0d (diff) | |
Merge branch 'master' into no-manifests
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/manual/conf-file.xml | 15 | ||||
| -rw-r--r-- | doc/manual/release-notes.xml | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/doc/manual/conf-file.xml b/doc/manual/conf-file.xml index 021b42ec63f3..cccee8d46202 100644 --- a/doc/manual/conf-file.xml +++ b/doc/manual/conf-file.xml @@ -357,7 +357,20 @@ build-use-chroot = /dev /proc /bin</programlisting> <literal>true</literal>.</para></listitem> </varlistentry> - + + + <varlistentry><term><literal>auto-optimise-store</literal></term> + + <listitem><para>If set to <literal>true</literal> (the default), + Nix automatically detects files in the store that have identical + contents, and replaces them with hard links to a single copy. + This saves disk space. If set to <literal>false</literal>, you + can still run <command>nix-store --optimise</command> to get rid + of duplicate files.</para></listitem> + + </varlistentry> + + </variablelist> </para> diff --git a/doc/manual/release-notes.xml b/doc/manual/release-notes.xml index 4dfcb6b477ca..7c78122f0267 100644 --- a/doc/manual/release-notes.xml +++ b/doc/manual/release-notes.xml @@ -8,7 +8,7 @@ <!--==================================================================--> -<section xml:id="ssec-relnotes-1.1"><title>Release 1.1 (TBA)</title> +<section xml:id="ssec-relnotes-1.1"><title>Release 1.1 (July 18, 2012)</title> <para>This release has the following improvements:</para> |