2 files changed, 9 insertions, 1 deletions
diff --git a/doc/manual/release-notes.xml b/doc/manual/release-notes.xml
index 3140f629785b..490305d1b809 100644
--- a/doc/manual/release-notes.xml
+++ b/doc/manual/release-notes.xml
@@ -53,6 +53,14 @@ irreversible.</para></warning>
<listitem><para>Reference scanning (which happens after each build)
is much faster.</para></listitem>
+ <listitem><para>TODO: string interpolation</para></listitem>
+
+ <listitem><para>TODO: string concatenations involving
+ derivations</para></listitem>
+
+ <listitem><para>TODO: function argument default values can refer to
+ other function arguments</para></listitem>
+
</itemizedlist>
</section>
diff --git a/doc/manual/troubleshooting.xml b/doc/manual/troubleshooting.xml
index 4179eb8411d3..ebd454a97266 100644
--- a/doc/manual/troubleshooting.xml
+++ b/doc/manual/troubleshooting.xml
@@ -55,7 +55,7 @@ so it just gives up.</para>
<para>Solution: remove one of the offending packages from the user
environment (if already installed) using <command>nix-env
--u</command>, or specify exactly which version should be installed
+-e</command>, or specify exactly which version should be installed
(e.g., <literal>nix-env -i docbook-xml-4.2</literal>).</para>
<para>Alternatively, you can modify the user environment builder
|
