about summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2010-04-20T09·20+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2010-04-20T09·20+0000
commitd66ea83a763a36e7e7b9558b90abcfe09bec1b85 (patch)
tree6eaa7fc607da31c6ed3e221826cb1d6be43a6c9b /doc
parentf71ea9c911294ec72f52137175ad088a2f50ab97 (diff)
parentaac5fcfbb54ff64c593d8919f7f52025415ea996 (diff)
* Sync with the trunk.
Diffstat (limited to 'doc')
-rw-r--r--doc/manual/package-management.xml2
-rw-r--r--doc/manual/release-notes.xml12
2 files changed, 13 insertions, 1 deletions
diff --git a/doc/manual/package-management.xml b/doc/manual/package-management.xml
index fa40af2ef7cd..8cc6aa857edd 100644
--- a/doc/manual/package-management.xml
+++ b/doc/manual/package-management.xml
@@ -38,7 +38,7 @@ to end-user applications like Mozilla Firefox.  (Nix is however not
 tied to the Nix Package collection; you could write your own Nix
 expressions based on it, or completely new ones.)  You can download
 the latest version from <link
-xlink:href='http://nixos.org/releases/full-index-nixpkgs.html' />.</para>
+xlink:href='http://nixos.org/nixpkgs/download.html' />.</para>
 
 <para>Assuming that you have downloaded and unpacked a release of Nix
 Packages, you can view the set of available packages in the release:
diff --git a/doc/manual/release-notes.xml b/doc/manual/release-notes.xml
index 907d6dc7c9c0..e79563440416 100644
--- a/doc/manual/release-notes.xml
+++ b/doc/manual/release-notes.xml
@@ -8,6 +8,18 @@
 
 <!--==================================================================-->
 
+<section xml:id="ssec-relnotes-0.15"><title>Release 0.15 (March 17, 2010)</title>
+
+<para>This is a bug-fix release.  Among other things, it fixes
+building on Mac OS X (Snow Leopard), and improves the contents of
+<filename>/etc/passwd</filename> and <filename>/etc/group</filename>
+in <literal>chroot</literal> builds.</para>
+
+</section>
+
+
+<!--==================================================================-->
+
 <section xml:id="ssec-relnotes-0.14"><title>Release 0.14 (February 4, 2010)</title>
 
 <para>This release has the following improvements:</para>