From ba1fa6d61748ba302c1ea78e01fbaac254c5762e Mon Sep 17 00:00:00 2001
From: Lance Edgar <ledgar@sacfoodcoop.com>
Date: Wed, 9 Nov 2016 02:17:01 -0600
Subject: [PATCH] Tweak verbiage for merge template etc.

---
 tailbone/templates/master/merge.mako | 8 +++++++-
 tailbone/views/master.py             | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/tailbone/templates/master/merge.mako b/tailbone/templates/master/merge.mako
index 6e1abac5..82267146 100644
--- a/tailbone/templates/master/merge.mako
+++ b/tailbone/templates/master/merge.mako
@@ -91,7 +91,13 @@
   You are about to <strong>merge</strong> two ${model_title} records,
   (possibly) along with various related data.&nbsp; The tool you are using now
   is somewhat generic and is not able to give you the full picture of the
-  implications of this merge.&nbsp; You are urged to proceed with caution!
+  implications of this merge.&nbsp; You are urged to proceed with caution!&nbsp;
+</p>
+
+<p class="warning">
+  <strong>Unless you know what you're doing, a good rule of thumb (though still no
+  guarantee) is to merge <em>only</em> if the "resulting" column is all-white.</strong>&nbsp;
+  (You may be able to swap kept/removed in order to achive this.)
 </p>
 
 <p>
diff --git a/tailbone/views/master.py b/tailbone/views/master.py
index 0d0e096b..89f6e524 100644
--- a/tailbone/views/master.py
+++ b/tailbone/views/master.py
@@ -429,7 +429,7 @@ class MasterView(View):
                     try:
                         self.validate_merge(object_to_remove, object_to_keep)
                     except Exception as error:
-                        self.request.session.flash("Requested merge cannot proceed (maybe swap keep/remove and try again?): {}".format(error), 'error')
+                        self.request.session.flash("Requested merge cannot proceed (maybe swap kept/removed and try again?): {}".format(error), 'error')
                     else:
                         self.merge_objects(object_to_remove, object_to_keep)
                         self.request.session.flash("{} has been merged into {}".format(msg, object_to_keep))