diff options
| author | Ivan Kozik <ivan@ludios.org> | 2013-08-10T21·36+0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-08-26T09·15+0200 |
| commit | 34bb806f747d5edc16119e38e2ac44e6b236ac12 (patch) | |
| tree | bee9d463cd53277998bc20b7b37e78745461ce25 /doc/manual/nix-env.xml | |
| parent | c6c024ca6f587dab991589ad6fdf010b9f0e6d62 (diff) | |
Fix typos, especially those that end up in the Nix manual
Diffstat (limited to 'doc/manual/nix-env.xml')
| -rw-r--r-- | doc/manual/nix-env.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/manual/nix-env.xml b/doc/manual/nix-env.xml index ff9f9c16a2cb..84c875dad219 100644 --- a/doc/manual/nix-env.xml +++ b/doc/manual/nix-env.xml @@ -272,7 +272,7 @@ number of possible ways: linkend="ss-functions">functions</link> that are called with the active Nix expression as their single argument. The derivations returned by those function calls are installed. This allows - derivations to be specified in a unambiguous way, which is necessary + derivations to be specified in an unambiguous way, which is necessary if there are multiple derivations with the same name.</para></listitem> @@ -692,7 +692,7 @@ firefox-2.0.0.9 <lineannotation>(the current one)</lineannotation> $ nix-env --preserve-installed -i firefox-2.0.0.11 installing `firefox-2.0.0.11' building path(s) `/nix/store/myy0y59q3ig70dgq37jqwg1j0rsapzsl-user-environment' -Collission between `/nix/store/<replaceable>...</replaceable>-firefox-2.0.0.11/bin/firefox' +collision between `/nix/store/<replaceable>...</replaceable>-firefox-2.0.0.11/bin/firefox' and `/nix/store/<replaceable>...</replaceable>-firefox-2.0.0.9/bin/firefox'. <lineannotation>(i.e., can’t have two active at the same time)</lineannotation> @@ -1244,7 +1244,7 @@ wrapper around <option>--list-generations</option> and $ nix-env --rollback switching from generation 92 to 91 -$ nix-env --rolback +$ nix-env --rollback error: no generation older than the current (91) exists</screen> </refsection> |