From a46db5d013a5c3ab5b041824bfb935e5c042886c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri, 27 Apr 2007 23:28:44 +0000
Subject: * Package conflict resolution through priority levels.  If there is a
   user environment collission between two packages due to overlapping   file
 names, then a package with a higher priority will overwrite the   symlinks of
 a package with a lower priority.  E.g.,

    $ nix-env --set-flag priority 5 gcc
    $ nix-env --set-flag priority 10 binutils

  gives gcc a higher priority than binutils (higher number = lower
  priority).
---
 doc/manual/release-notes.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc/manual/release-notes.xml')

diff --git a/doc/manual/release-notes.xml b/doc/manual/release-notes.xml
index e5d0adf74..161643e52 100644
--- a/doc/manual/release-notes.xml
+++ b/doc/manual/release-notes.xml
@@ -71,7 +71,9 @@
   environments.</para></listitem>
 
   <listitem><para>TODO: <command>nix-env</command>
-  <option>--set-flag</option>.</para></listitem>
+  <option>--set-flag</option>.  Specific flags:
+  <literal>active</literal>,
+  <literal>priority</literal>.</para></listitem>
   
 
   <listitem><para><command>nix-env -q</command> now has a flag
-- 
cgit v1.2.3