Manual tweaks

This commit is contained in:
Eelco Dolstra 2013-10-31 18:49:04 +01:00
parent 987641d6ed
commit 8e6abe49cd
2 changed files with 7 additions and 1 deletions

View File

@ -641,6 +641,11 @@ manual</link> for the rest.</para>
<entry><literal>let x = "foo"; y = "bar"; in x + y</literal></entry>
<entry>Variable definition</entry>
</row>
<row>
<entry><literal>with pkgs.lib; head [ 1 2 3 ]</literal></entry>
<entry>Add all attributes from the given set to the scope
(evaluates to <literal>1</literal>)</entry>
</row>
<row>
<entry namest="c1" nameend="c2"><emphasis>Functions (lambdas)</emphasis></entry>

View File

@ -398,7 +398,8 @@ been built. These channels are:
system to be upgraded from 3.4.66 to 3.4.67 (a minor bug fix), but
not from 3.4.<replaceable>x</replaceable> to
3.11.<replaceable>x</replaceable> (a major change that has the
potential to break things).</para>
potential to break things). Stable channels are generally
maintained until the next stable branch is created.</para>
</listitem>
<listitem>
<para>The unstable channel, <literal