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>2004-01-09T14·18+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2004-01-09T14·18+0000
commit46a71c857c617b5acbf3d1fdb8fb7e676a4881a2 (patch)
tree45d2ccb92a5852cd96a28598d20a3d6435bb7ea1 /doc/manual/nix-env.xml
parent30b31a8f6190dad40ca972b445420e10f47a9afc (diff)
* Option `--force-realise' in `nix-store --query'.
Diffstat (limited to 'doc/manual/nix-env.xml')
-rw-r--r--doc/manual/nix-env.xml29
1 files changed, 13 insertions, 16 deletions
diff --git a/doc/manual/nix-env.xml b/doc/manual/nix-env.xml
index d8b50bf3cd07..702faa621156 100644
--- a/doc/manual/nix-env.xml
+++ b/doc/manual/nix-env.xml
@@ -7,18 +7,14 @@
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>nix-env</command>
-      <group choice='opt' rep='repeat'>
-        <arg><option>--verbose</option></arg>
-        <arg><option>-v</option></arg>
-      </group>
-      <group choice='opt'>
-        <arg><option>--keep-failed</option></arg>
-        <arg><option>-K</option></arg>
-      </group>
+      <arg rep='repeat'><option>--verbose</option></arg>
+      <arg rep='repeat'><option>-v</option></arg>
+      <arg><option>--keep-failed</option></arg>
+      <arg><option>-K</option></arg>
       <arg>
-        <group choice='opt'>
-          <arg><option>--file</option></arg>
-          <arg><option>-f</option></arg>
+        <group choice='req'>
+          <arg choice='plain'><option>--file</option></arg>
+          <arg choice='plain'><option>-f</option></arg>
         </group>
         <replaceable>path</replaceable>
       </arg>
@@ -76,7 +72,7 @@
       &opt-verbose;
 
       <varlistentry>
-        <term><option>--file</option></term>
+        <term><option>--file</option> / <option>-f</option></term>
         <listitem>
           <para>
             Specifies the Nix expression used by the
@@ -125,8 +121,8 @@
             By default, it points to
             <filename><replaceable>prefix</replaceable>/var/nix/links/current</filename>.
             The <envar>PATH</envar> environment variable should
-            include <filename>~/.nix-userenv</filename> for the use
-            environments to be visible to the user.
+            include <filename>~/.nix-userenv</filename> for the user
+            environment to be visible to the user.
           </para>
         </listitem>
       </varlistentry>
@@ -146,8 +142,9 @@
       <title>Synopsis</title>
       <cmdsynopsis>
         <command>nix-env</command>
-        <group>
-          <arg><option>--install</option></arg>
+        <group choice='req'>
+          <arg choice='plain'><option>--install</option></arg>
+          <arg choice='plain'><option>-i</option></arg>
         </group>
       </cmdsynopsis>
     </refsection>