* Typos etc.

* Set the release date.

2 files changed, 15 insertions, 6 deletions

diff --git a/doc/manual/nix-env.xml b/doc/manual/nix-env.xml
index ff005830e171..8669b9ccf6c4 100644
--- a/doc/manual/nix-env.xml
+++ b/doc/manual/nix-env.xml
@@ -208,7 +208,16 @@ number of possible ways:
   installed.  Currently installed derivations with a name equal to the
   name of a derivation being added are removed unless the option
   <option>--preserve-installed</option> is
-  specified.</para></listitem>
+  specified.</para>
+
+  <para>If there are multiple derivations matching a name in
+  <replaceable>args</replaceable> that have the same name (e.g.,
+  <literal>gcc-3.3.6</literal> and <literal>gcc-4.1.1</literal>), then
+  only the highest version will be installed.  You can force the
+  installation of multiple derivations with the same name by being
+  specific about the versions.  For instance, <literal>nix-env -i
+  gcc-3.3.6 gcc-4.1.1</literal> will install both version of GCC (and
+  will probably cause a user environment conflict!).</para></listitem>
 
   <listitem><para>If <link
   linkend='opt-attr'><option>--attr</option></link>
diff --git a/doc/manual/release-notes.xml b/doc/manual/release-notes.xml
index a4a4f5034407..ea85cacf998c 100644
--- a/doc/manual/release-notes.xml
+++ b/doc/manual/release-notes.xml
@@ -7,7 +7,7 @@
 
 <!--==================================================================-->
 
-<section><title>Release 0.10 (TBA)</title>
+<section><title>Release 0.10 (October 6, 2006)</title>
 
 <note><para>This version of Nix uses Berkeley DB 4.4 instead of 4.3.
 The database is upgraded automatically, but you should be careful not
@@ -38,8 +38,8 @@ irreversible.</para></warning>
       (or <option>-c</option>) has been added to <command>nix-env
       --query</command> to allow you to compare installed versions of
       packages to available versions, or vice versa.  An easy way to
-      see if you are up to date with what’s in the channel is
-      <literal>nix-env -qc \*</literal>.</para></listitem>
+      see if you are up to date with what’s in your subscribed
+      channels is <literal>nix-env -qc \*</literal>.</para></listitem>
 
       <listitem><para><literal>nix-env --query</literal> now takes as
       arguments a list of package names about which to show
@@ -111,7 +111,7 @@ irreversible.</para></warning>
       <listitem><para>TODO: domain checks (r5895).</para></listitem>
       -->
 
-      <listitem><para>Lots of new builtin primitives, such as
+      <listitem><para>Lots of new built-in primitives, such as
       functions for list manipulation and integer arithmetic.  See the
       manual for a complete list.  All primops are now available in
       the set <varname>builtins</varname>, allowing one to test for
@@ -283,7 +283,7 @@ irreversible.</para></warning>
   nix-store</literal> without triggering a database
   recovery.</para></listitem>
 
-  <listitem><para><command>bsdiff</command> updated
+  <listitem><para><command>bsdiff</command> updated to version
   4.3.</para></listitem>
 
   <listitem><para>Substantial performance improvements in expression