diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-02-01 10:00:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-01 10:00:59 +0100 |
| commit | 7f49fa63caf2e61d71e4b69daba675bf7e00bcad (patch) | |
| tree | d13684cc9d560abc4c22c652e70785e3ab55f35d /nixos/doc | |
| parent | 1e5cfc9cc88b3f11bca636069ea3aa1525a9c579 (diff) | |
| parent | ed51fd0033b5d5e2ad40cca02cc9864db845b586 (diff) | |
Merge pull request #75439 from Ma27/submodule-fixes-for-nixos-option
nixos/nixos-option: fix evaluator to render a full submodule entry
Diffstat (limited to 'nixos/doc')
| -rw-r--r-- | nixos/doc/manual/man-nixos-option.xml | 21 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2003.xml | 2 |
2 files changed, 13 insertions, 10 deletions
diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml index b82f31256099..b921386d0df0 100644 --- a/nixos/doc/manual/man-nixos-option.xml +++ b/nixos/doc/manual/man-nixos-option.xml @@ -14,12 +14,16 @@ <refsynopsisdiv> <cmdsynopsis> <command>nixos-option</command> + <arg> - <option>-I</option> <replaceable>path</replaceable> + <group choice='req'> + <arg choice='plain'><option>-r</option></arg> + <arg choice='plain'><option>--recursive</option></arg> + </group> </arg> <arg> - <option>--all</option> + <option>-I</option> <replaceable>path</replaceable> </arg> <arg> @@ -46,23 +50,22 @@ </para> <variablelist> <varlistentry> - <term> - <option>-I</option> <replaceable>path</replaceable> - </term> + <term><option>-r</option></term> + <term><option>--recursive</option></term> <listitem> <para> - This option is passed to the underlying - <command>nix-instantiate</command> invocation. + Print all the values at or below the specified path recursively. </para> </listitem> </varlistentry> <varlistentry> <term> - <option>--all</option> + <option>-I</option> <replaceable>path</replaceable> </term> <listitem> <para> - Print the values of all options. + This option is passed to the underlying + <command>nix-instantiate</command> invocation. </para> </listitem> </varlistentry> diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 4ee9ebd6a2b4..8883c99d4b70 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -59,7 +59,7 @@ <listitem> <para> <command>nixos-option</command> has been rewritten in C++, speeding it up, improving correctness, - and adding a <option>--all</option> option which prints all options and their values. + and adding a <option>-r</option> option which prints all options and their values recursively. </para> </listitem> <listitem> |