From 0d81bd9cc88ac417d3035600d2251452fd9dabaa Mon Sep 17 00:00:00 2001
From: Peter Geoghegan <peter.geoghegan86@gmail.com>
Date: Fri, 24 Apr 2015 18:40:36 -0700
Subject: [PATCH] Polish trigger documentation

---
 doc/src/sgml/trigger.sgml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/doc/src/sgml/trigger.sgml b/doc/src/sgml/trigger.sgml
index 5141690877e9b..962c55b9bae97 100644
--- a/doc/src/sgml/trigger.sgml
+++ b/doc/src/sgml/trigger.sgml
@@ -138,17 +138,17 @@
     idempotent).  Note that statement-level <command>UPDATE</command>
     triggers are executed when <literal>ON CONFLICT UPDATE</> is
     specified, regardless of whether or not any rows were affected by
-    the <command>UPDATE</command>.  An <command>INSERT</command> with
-    an <literal>ON CONFLICT UPDATE</> clause will execute
-    statement-level <literal>BEFORE</> <command>INSERT</command>
-    triggers first, then statement-level <literal>BEFORE</>
-    <command>UPDATE</command> triggers, followed by statement-level
-    <literal>AFTER</> <command>UPDATE</command> triggers and finally
-    statement-level <literal>AFTER</> <command>INSERT</command>
-    triggers.  <literal>ON CONFLICT UPDATE</> is not supported on
-    views (Only <literal>ON CONFLICT IGNORE</> is supported on
-    updatable views); therefore, unpredictable interactions with
-    <literal>INSTEAD OF</> triggers are not possible.
+    the <command>UPDATE</command> (and regardless of whether the
+    alternative <command>UPDATE</command> path was ever taken).  An
+    <command>INSERT</command> with an <literal>ON CONFLICT UPDATE</>
+    clause will execute statement-level <literal>BEFORE</>
+    <command>INSERT</command> triggers first, then statement-level
+    <literal>BEFORE</> <command>UPDATE</command> triggers, followed by
+    statement-level <literal>AFTER</> <command>UPDATE</command>
+    triggers and finally statement-level <literal>AFTER</>
+    <command>INSERT</command> triggers.  <literal>ON CONFLICT
+    UPDATE</> is not supported on views (only <literal>ON CONFLICT
+    IGNORE</> is supported on updatable views).
    </para>
 
    <para>