From 88c5899eb3f31599e7aabd13f15c1aa208255763 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Tue, 13 Dec 2016 12:19:10 +0000
Subject: [PATCH] nixpkgs manual: Remove obsolete warning

PR #815 has already been merged
---
 doc/multiple-output.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml
index b7a363c750e61..a81ad6ca9eb4d 100644
--- a/doc/multiple-output.xml
+++ b/doc/multiple-output.xml
@@ -16,7 +16,6 @@
 
 <section><title>Installing a split package</title>
   <para>When installing a package via <varname>systemPackages</varname> or <command>nix-env</command> you have several options:</para>
-  <warning><para>Currently <command>nix-env</command> almost always installs all outputs until https://github.com/NixOS/nix/pull/815 gets merged.</para></warning>
   <itemizedlist>
     <listitem><para>You can install particular outputs explicitly, as each is available in the Nix language as an attribute of the package.  The <varname>outputs</varname> attribute contains a list of output names.</para></listitem>
     <listitem><para>You can let it use the default outputs.  These are handled by <varname>meta.outputsToInstall</varname> attribute that contains a list of output names.</para>