about summary refs log tree commit diff
path: root/doc/manual
diff options
context:
space:
mode:
authorRobert Vollmert <rob@vllmrt.net>2017-07-07T19·51+0200
committerRobert Vollmert <rob@vllmrt.net>2017-07-07T20·11+0200
commit8ad898b2cd2f5d7bba29da48f67658d3a04888db (patch)
tree925216f7771246160482a14111d54288f760e793 /doc/manual
parentb1f5995a20b5511bce614d1718816088bc7f0ec0 (diff)
man page (nix-instantiate): Add --json to synopsis, order variables
Diffstat (limited to 'doc/manual')
-rw-r--r--doc/manual/command-ref/nix-instantiate.xml33
1 files changed, 17 insertions, 16 deletions
diff --git a/doc/manual/command-ref/nix-instantiate.xml b/doc/manual/command-ref/nix-instantiate.xml
index fe077ff65603..874228954700 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>
@@ -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>