diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-31 18:49:04 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-31 18:49:04 +0100 |
| commit | 8e6abe49cdafad942e63db24d29dd99dc26162fb (patch) | |
| tree | e78d009ad7101fa002fa211d3038d18239ce1910 /nixos | |
| parent | 987641d6edc3a5961dead5ee696c1a1a5ff71ee9 (diff) | |
| download | nixlib-8e6abe49cdafad942e63db24d29dd99dc26162fb.tar nixlib-8e6abe49cdafad942e63db24d29dd99dc26162fb.tar.gz nixlib-8e6abe49cdafad942e63db24d29dd99dc26162fb.tar.bz2 nixlib-8e6abe49cdafad942e63db24d29dd99dc26162fb.tar.lz nixlib-8e6abe49cdafad942e63db24d29dd99dc26162fb.tar.xz nixlib-8e6abe49cdafad942e63db24d29dd99dc26162fb.tar.zst nixlib-8e6abe49cdafad942e63db24d29dd99dc26162fb.zip | |
Manual tweaks
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/configuration.xml | 5 | ||||
| -rw-r--r-- | nixos/doc/manual/installation.xml | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml index cfd4a76290b9..a8bda210dcf5 100644 --- a/nixos/doc/manual/configuration.xml +++ b/nixos/doc/manual/configuration.xml @@ -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> diff --git a/nixos/doc/manual/installation.xml b/nixos/doc/manual/installation.xml index ba9bfcc652b8..88ef589dd06a 100644 --- a/nixos/doc/manual/installation.xml +++ b/nixos/doc/manual/installation.xml @@ -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 |