diff --git a/doc/manual/nix-env.xml b/doc/manual/nix-env.xml
index 4772c2b11..35107115a 100644
--- a/doc/manual/nix-env.xml
+++ b/doc/manual/nix-env.xml
@@ -22,6 +22,11 @@
path
+
+
+
+ system
+ operationoptions
@@ -121,6 +126,38 @@
+
+
+
+
+ By default, when you install a derivation with the
+ operation, it will replace
+ previously installed versions with the same derivation
+ name (regardless of the version number). This option
+ causes those previously installed versions to be kept in
+ the new generation of the profile. Note that this will
+ generally cause conflicts in the creation of the user
+ environment (since multiple versions of a package
+ typically contain the same programs).
+
+
+
+
+
+ system
+
+
+ By default, operations such as only include derivations matching the
+ current platform. This option allows you to use
+ derivations for the specified platform
+ system. The special value
+ * causes derivations for any platform
+ to be included.
+
+
+
+
@@ -719,6 +756,47 @@ $ nix-env --list-generations
+
+
+
+ Operation
+
+
+ Synopsis
+
+ nix-env
+
+ generations
+
+
+
+
+ Description
+
+
+ This operation deletes the specified generations of the
+ current profile. The generations can be a list of generation
+ numbers, or the special value old to delete
+ all non-current generations. Periodically deleting old
+ generations is important to make garbage collection effective.
+
+
+
+
+
+ Examples
+
+
+$ nix-env --delete-generations 3 4 8
+
+$ nix-env -p other_profile --delete-generations old
+
+
+
+
+
+
+
diff --git a/src/nix-env/help.txt b/src/nix-env/help.txt
index f363d3f94..fe9eca79e 100644
--- a/src/nix-env/help.txt
+++ b/src/nix-env/help.txt
@@ -16,6 +16,8 @@ name `*' may be used to indicate all derivations.
--switch-generation / -G NUMBER: switch to specified generation of profile
--rollback: switch to the previous generation
--list-generations: list available generations of a profile
+ --delete-generations GENERATIONS...: deleted listed generations,
+ `old' for all non-current generations
--import / -I FILE: set default Nix expression
@@ -49,3 +51,5 @@ Options:
--file / -f FILE: use Nix expression FILE for installation, etc.
--verbose / -v: verbose operation (may be repeated)
--keep-failed / -K: keep temporary directories of failed builds
+ --preserve-installed: do not replace currently installed versions in `-i'
+ --system-filter SYSTEM: only use derivations for specified platform