diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-21T14·30+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-21T14·30+0100 |
| commit | 81628a6ccc6ce496735b22492bee15c9ad46f072 (patch) | |
| tree | d1ec18b84514d2f44700082f8d800efb929a7678 /doc/manual/writing-nix-expressions.xml | |
| parent | b1db599dd05e86f65e73dc40584913e6e78c2bac (diff) | |
| parent | 5ef8508a92997dbd7f8aa501b64fd283fb1c7bb8 (diff) | |
Merge branch 'master' into make
Conflicts: src/libexpr/eval.cc
Diffstat (limited to 'doc/manual/writing-nix-expressions.xml')
| -rw-r--r-- | doc/manual/writing-nix-expressions.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/manual/writing-nix-expressions.xml b/doc/manual/writing-nix-expressions.xml index 4b6574288eb2..3e6cd7379015 100644 --- a/doc/manual/writing-nix-expressions.xml +++ b/doc/manual/writing-nix-expressions.xml @@ -782,6 +782,9 @@ stdenv.mkDerivation { <literal>true</literal> and <literal>false</literal>.</para></listitem> + <listitem><para>The null value, denoted as + <literal>null</literal>.</para></listitem> + </itemizedlist> </para> |