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-instantiate.xml | |
| parent | 1762b9616cf8786270b2efb55800a8036574ed21 (diff) | |
| parent | 30117fb35bde6ba27d7de5037272ea23c8dcebf9 (diff) | |
Merge branch 'man2' of git://github.com/robx/nix
Diffstat (limited to 'doc/manual/command-ref/nix-instantiate.xml')
| -rw-r--r-- | doc/manual/command-ref/nix-instantiate.xml | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/doc/manual/command-ref/nix-instantiate.xml b/doc/manual/command-ref/nix-instantiate.xml index fe077ff65603..39c1282fcc36 100644 --- a/doc/manual/command-ref/nix-instantiate.xml +++ b/doc/manual/command-ref/nix-instantiate.xml @@ -24,6 +24,7 @@ <arg choice='plain'> <option>--eval</option> <arg><option>--strict</option></arg> + <arg><option>--json</option></arg> <arg><option>--xml</option></arg> </arg> </group> @@ -38,7 +39,7 @@ </arg> <arg><option>--add-root</option> <replaceable>path</replaceable></arg> <arg><option>--indirect</option></arg> - <group choice='req'> + <group> <arg choice='plain'><option>--expr</option></arg> <arg choice='plain'><option>-E</option></arg> </group> @@ -116,13 +117,17 @@ input.</para> </varlistentry> - <varlistentry><term><option>--xml</option></term> + <varlistentry><term><option>--strict</option></term> - <listitem><para>When used with <option>--eval</option>, print the resulting - value as an XML representation of the abstract syntax tree rather than as - an ATerm. The schema is the same as that used by the <link - linkend="builtin-toXML"><function>toXML</function> built-in</link>. - </para></listitem> + <listitem><para>When used with <option>--eval</option>, + recursively evaluate list elements and attributes. Normally, such + sub-expressions are left unevaluated (since the Nix expression + language is lazy).</para> + + <warning><para>This option can cause non-termination, because lazy + data structures can be infinitely large.</para></warning> + + </listitem> </varlistentry> @@ -134,17 +139,13 @@ input.</para> </varlistentry> - <varlistentry><term><option>--strict</option></term> - - <listitem><para>When used with <option>--eval</option>, - recursively evaluate list elements and attributes. Normally, such - sub-expressions are left unevaluated (since the Nix expression - language is lazy).</para> - - <warning><para>This option can cause non-termination, because lazy - data structures can be infinitely large.</para></warning> + <varlistentry><term><option>--xml</option></term> - </listitem> + <listitem><para>When used with <option>--eval</option>, print the resulting + value as an XML representation of the abstract syntax tree rather than as + an ATerm. The schema is the same as that used by the <link + linkend="builtin-toXML"><function>toXML</function> built-in</link>. + </para></listitem> </varlistentry> |