From 8e6abe49cdafad942e63db24d29dd99dc26162fb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 31 Oct 2013 18:49:04 +0100
Subject: [PATCH] Manual tweaks

---
 nixos/doc/manual/configuration.xml | 5 +++++
 nixos/doc/manual/installation.xml  | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

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