about summary refs log tree commit diff
path: root/doc/manual/nix-env.xml
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2006-10-05T09·08+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2006-10-05T09·08+0000
commit5d769de8a34474f4e76911927118312b69b47136 (patch)
tree59a2f5584b288b370fbaebc62ef43dad6dead39a /doc/manual/nix-env.xml
parent6f2bfd92b695a31b35d8d515cd4ee12f9fc2c786 (diff)
* Document --arg.
Diffstat (limited to 'doc/manual/nix-env.xml')
-rw-r--r--doc/manual/nix-env.xml15
1 files changed, 1 insertions, 14 deletions
diff --git a/doc/manual/nix-env.xml b/doc/manual/nix-env.xml
index ee228f37425e..5aa38c81c842 100644
--- a/doc/manual/nix-env.xml
+++ b/doc/manual/nix-env.xml
@@ -10,6 +10,7 @@
   <cmdsynopsis>
     <command>nix-env</command>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opt-common-syn.xml#xpointer(/nop/*)" />
+    <arg><option>--arg</option> <replaceable>name</replaceable> <replaceable>value</replaceable></arg>
     <arg>
       <group choice='req'>
         <arg choice='plain'><option>--file</option></arg>
@@ -24,7 +25,6 @@
       </group>
       <replaceable>path</replaceable>
     </arg>
-    <arg><option>--preserve-installed</option></arg>
     <arg>
       <arg choice='plain'><option>--system-filter</option></arg>
       <replaceable>system</replaceable>
@@ -106,19 +106,6 @@ linkend="sec-common-options" />.</para>
     
   </varlistentry>
       
-  <varlistentry><term><option>--preserve-installed</option></term>
-  
-    <listitem><para>By default, when you install a derivation with the
-    <option>--install</option> 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).</para></listitem>
-    
-  </varlistentry>
-      
   <varlistentry><term><option>--system-filter</option> <replaceable>system</replaceable></term>
   
     <listitem><para>By default, operations such as <option>--query