diff options
author | Shea Levy <shea@shealevy.com> | 2017-07-10T12·43-0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2017-07-10T12·43-0400 |
commit | 62a8fe6388a1ee8f9376b8e65b0cb9a02c313e9f (patch) | |
tree | 93f7ea62c280a5272f75d9890fc7d0654cd7d7ed /doc/manual/command-ref/nix-env.xml | |
parent | 1762b9616cf8786270b2efb55800a8036574ed21 (diff) | |
parent | 30117fb35bde6ba27d7de5037272ea23c8dcebf9 (diff) |
Merge branch 'man2' of git://github.com/robx/nix
Diffstat (limited to 'doc/manual/command-ref/nix-env.xml')
-rw-r--r-- | doc/manual/command-ref/nix-env.xml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/doc/manual/command-ref/nix-env.xml b/doc/manual/command-ref/nix-env.xml index 8462cf8a0270..d4563ac47551 100644 --- a/doc/manual/command-ref/nix-env.xml +++ b/doc/manual/command-ref/nix-env.xml @@ -146,8 +146,7 @@ also <xref linkend="sec-common-options" />.</phrase></para> <variablelist> - <varlistentry><term><option>--file</option></term> - <term><option>-f</option></term> + <varlistentry><term><option>--file</option> / <option>-f</option> <replaceable>path</replaceable></term> <listitem><para>Specifies the Nix expression (designated below as the <emphasis>active Nix expression</emphasis>) used by the @@ -166,8 +165,7 @@ also <xref linkend="sec-common-options" />.</phrase></para> </varlistentry> - <varlistentry><term><option>--profile</option></term> - <term><option>-p</option></term> + <varlistentry><term><option>--profile</option> / <option>-p</option> <replaceable>path</replaceable></term> <listitem><para>Specifies the profile to be used by those operations that operate on a profile (designated below as the |