diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/manual/builtins.xml | 10 | ||||
-rw-r--r-- | doc/manual/release-notes.xml | 22 |
2 files changed, 30 insertions, 2 deletions
diff --git a/doc/manual/builtins.xml b/doc/manual/builtins.xml index 3eee36f2aec7..c7ebcc9a3346 100644 --- a/doc/manual/builtins.xml +++ b/doc/manual/builtins.xml @@ -324,6 +324,16 @@ x: x + 456</programlisting> </varlistentry> + <varlistentry><term><function>builtins.intersectAttrs</function> + <replaceable>e1</replaceable> <replaceable>e2</replaceable></term> + + <listitem><para>Return an attribute set consisting of the + attributes in the set <replaceable>e2</replaceable> that also + exist in the set <replaceable>e1</replaceable>.</para></listitem> + + </varlistentry> + + <varlistentry><term><function>builtins.isAttrs</function> <replaceable>e</replaceable></term> diff --git a/doc/manual/release-notes.xml b/doc/manual/release-notes.xml index bf79840d84da..81543d313e07 100644 --- a/doc/manual/release-notes.xml +++ b/doc/manual/release-notes.xml @@ -8,7 +8,7 @@ <!--==================================================================--> -<section xml:id="ssec-relnotes-0.13"><title>Release 0.13 (September NN, +<section xml:id="ssec-relnotes-0.13"><title>Release 0.13 (November 4, 2009)</title> <para>This is primarily a bug fix release. It has some new @@ -85,7 +85,25 @@ features:</para> add a string to stack traces — useful for debugging), <varname>builtins.isBool</varname>, <varname>builtins.isString</varname>, - <varname>builtins.isInt</varname>.</para> + <varname>builtins.isInt</varname>, + <varname>builtins.intersectAttrs</varname>.</para> + </listitem> + + <listitem> + <para>OpenSolaris support (Sander van der Burg).</para> + </listitem> + + <listitem> + <para>Stack traces are no longer displayed unless the + <option>--show-trace</option> option is used.</para> + </listitem> + + <listitem> + <para>The scoping rules for <literal>inherit + (<replaceable>e</replaceable>) ...</literal> in recursive + attribute sets have changed. The expression + <replaceable>e</replaceable> can now refer to the attributes + defined in the containing set.</para> </listitem> </itemizedlist> |