40/64: trunk -> master

[Ludovic Courtès]

civodul pushed a commit to branch nix
in repository guix.

commit 31fe55bb8e599702ac79b24b2109199be50a85a1
Author: Eelco Dolstra <address@hidden>
Date:   Fri Apr 25 14:55:13 2014 +0200

    trunk -> master
---
 doc/manual/installation.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml
index 3e7ffc5..a714091 100644
--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -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>.
 You can also get builds of the latest development release from our
 <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>
 
 <para>For Fedora, RPM packages are available.  These can be installed
@@ -197,7 +197,7 @@ a source distribution.</para>
 downloaded from the <link
 xlink:href="http://nixos.org/nix/download.html";>Nix homepage</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>
 
 <para>Alternatively, the most recent sources of Nix can be obtained