trunk -> master

This commit is contained in:
Eelco Dolstra 2014-04-25 14:55:13 +02:00
parent 700c678c2e
commit 31fe55bb8e

View file

@ -69,7 +69,7 @@ Debian, Ubuntu, Mac OS X and various other systems from the <link
xlink:href="http://nixos.org/nix/download.html">Nix homepage</link>. xlink:href="http://nixos.org/nix/download.html">Nix homepage</link>.
You can also get builds of the latest development release from our You can also get builds of the latest development release from our
<link <link
xlink:href="http://hydra.nixos.org/job/nix/trunk/release/latest-finished#tabs-constituents">continuous xlink:href="http://hydra.nixos.org/job/nix/master/release/latest-finished#tabs-constituents">continuous
build system</link>.</para> build system</link>.</para>
<para>For Fedora, RPM packages are available. These can be installed <para>For Fedora, RPM packages are available. These can be installed
@ -197,7 +197,7 @@ a source distribution.</para>
downloaded from the <link downloaded from the <link
xlink:href="http://nixos.org/nix/download.html">Nix homepage</link>. xlink:href="http://nixos.org/nix/download.html">Nix homepage</link>.
You can also grab the <link You can also grab the <link
xlink:href="http://hydra.nixos.org/job/nix/trunk/release/latest-finished#tabs-constituents">most xlink:href="http://hydra.nixos.org/job/nix/master/release/latest-finished#tabs-constituents">most
recent development release</link>.</para> recent development release</link>.</para>
<para>Alternatively, the most recent sources of Nix can be obtained <para>Alternatively, the most recent sources of Nix can be obtained