From aca014710e7c9edf6c39b80f9ad4fb34851b7458 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Sun, 11 Aug 2013 07:40:59 +0000
Subject: [PATCH 1/2] Subversion repos stopped updating last year

---
 doc/manual/installation.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index b85aee972fd..40a2efa1405 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -152,7 +152,7 @@ $ nixos-option --install</screen>
 $ nixos-checkout</screen>
 
   to make the installer use the latest NixOS/Nixpkgs sources from the
-  Subversion repository, rather than the sources on CD.</para></listitem>
+  Git repository, rather than the sources on CD.</para></listitem>
   -->
 
   <listitem><para>Do the installation:
@@ -315,7 +315,7 @@ available.</para>
 use the <literal>nixos-unstable</literal> channel.  (A channel is a
 Nix mechanism for distributing Nix expressions and associated
 binaries.)  The NixOS channel is updated automatically from NixOS’s
-Subversion repository after running certain tests and building most
+Git repository after running certain tests and building most
 packages.</para>
 
 <para>NixOS automatically subscribes you to the NixOS channel.  If for

From 78f090c82919d42643a7b3afe63d336461337ff9 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Sun, 11 Aug 2013 07:42:03 +0000
Subject: [PATCH 2/2] Explain how to use /my/sources with nix-env, not just
 nixos-rebuild

---
 doc/manual/development.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 95c1848e387..17d7103e0d4 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -48,6 +48,25 @@ $ nixos-rebuild switch -I <replaceable>/my/sources</replaceable>
 
 </para>
 
+<para><command>nixos-rebuild</command> affects only the system profile.
+To install packages to your user profile from expressions in
+<replaceable>/my/sources</replaceable>, use
+<command>nix-env -f <replaceable>/my/sources</replaceable>/nixpkgs</command>,
+or change the default by replacing the symlink in
+<filename>~/.nix-defexpr</filename>:
+
+<screen>
+$ rm -f ~/.nix-defexpr/channels
+$ ln -s <replaceable>/my/sources</replaceable>/nixpkgs ~/.nix-defexpr/nixpkgs
+</screen>
+
+</para>
+
+<para>You should not pass the base directory
+<filename><replaceable>/my/sources</replaceable></filename>
+to <command>nix-env</command>, as it will break after interpreting expressions
+in <filename>nixos/</filename> as packages.</para>
+
 </section>