From e6046739cd8dbc999c507ccced64d1990d8b35ec Mon Sep 17 00:00:00 2001
From: "Matthias C. M. Troffaes" <matthias.troffaes@gmail.com>
Date: Mon, 7 Dec 2015 08:49:04 +0000
Subject: doc/submitting-changes: mention master -> staging merge (see issue
 #11460)

---
 doc/submitting-changes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml
index fe331d0825062..0fd1954c528bd 100644
--- a/doc/submitting-changes.xml
+++ b/doc/submitting-changes.xml
@@ -270,7 +270,7 @@ Additional information.
 </listitem>
 
 <listitem>
-<para>If staging is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days, merge into master, then resume development on staging. <link xlink:href="http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-evaluations">Keep an eye on the staging evaluations here</link>.</para>
+<para>If staging is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days, merge into master, then resume development on staging. <link xlink:href="http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-evaluations">Keep an eye on the staging evaluations here</link>. If any fixes for staging happen to be already in master, then master can be merged into staging.</para>
 </listitem>
 
 <listitem>
-- 
cgit 1.4.1