diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-05-12T22·13+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-05-12T22·13+0000 |
| commit | aa45027818af8976dc73e6a299d5d918e5c51df1 (patch) | |
| tree | 6086eb0642bc90477397169d0ee3993c1789200e /doc/manual | |
| parent | a0e3b84fac56cad6377ecd1462058a6b29bb1ea8 (diff) | |
| parent | 8032f26ca0bd2233de066ce5786ff976bbd641ae (diff) | |
* Sync with the trunk.
Diffstat (limited to 'doc/manual')
| -rw-r--r-- | doc/manual/installation.xml | 14 | ||||
| -rw-r--r-- | doc/manual/nix-store.xml | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml index a1b99ca2e812..bc5e21f0d39a 100644 --- a/doc/manual/installation.xml +++ b/doc/manual/installation.xml @@ -96,15 +96,13 @@ ubiquitous 2.5.4a won't. Note that these are only required if you modify the parser or when you are building from the Subversion repository.</para> -<para>Nix uses CWI's ATerm library and the bzip2 compressor (including -the bzip2 library). These are included in the Nix source -distribution. If you build from the Subversion repository, you must -download them yourself and place them in the -<filename>externals/</filename> directory. See +<para>Nix uses the bzip2 compressor (including the bzip2 library). It +is included in the Nix source distribution. If you build from the +Subversion repository, you must download it yourself and place it in +the <filename>externals/</filename> directory. See <filename>externals/Makefile.am</filename> for the precise URLs of -these packages. Alternatively, if you already have them installed, -you can use <command>configure</command>'s -<option>--with-aterm</option> and <option>--with-bzip2</option> +this packages. Alternatively, if you already have it installed, you +can use <command>configure</command>'s <option>--with-bzip2</option> options to point to their respective locations.</para> </section> diff --git a/doc/manual/nix-store.xml b/doc/manual/nix-store.xml index 566c75bf3e9f..10bb3eda5774 100644 --- a/doc/manual/nix-store.xml +++ b/doc/manual/nix-store.xml @@ -342,7 +342,7 @@ $ nix-store --gc --max-freed $((100 * 1024 * 1024))</screen> <cmdsynopsis> <command>nix-store</command> - <arg choice='plain'><option>--gc</option></arg> + <arg choice='plain'><option>--delete</option></arg> <arg><option>--ignore-liveness</option></arg> <arg choice='plain' rep='repeat'><replaceable>paths</replaceable></arg> </cmdsynopsis> |