From 54916b99f7e97aa6e32a4f265527f7517539d802 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 2 Dec 2013 12:51:28 -0500
Subject: [PATCH] doc:  update wording of ineffective SET and ABORT commands

Wording by Alvaro Herrera
---
 doc/src/sgml/ref/abort.sgml           | 3 ++-
 doc/src/sgml/ref/rollback.sgml        | 2 +-
 doc/src/sgml/ref/set.sgml             | 5 +++--
 doc/src/sgml/ref/set_constraints.sgml | 3 ++-
 doc/src/sgml/ref/set_transaction.sgml | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/doc/src/sgml/ref/abort.sgml b/doc/src/sgml/ref/abort.sgml
index f3a2fa88ff..e9138d5702 100644
--- a/doc/src/sgml/ref/abort.sgml
+++ b/doc/src/sgml/ref/abort.sgml
@@ -63,7 +63,8 @@ ABORT [ WORK | TRANSACTION ]
   </para>
 
   <para>
-   Issuing <command>ABORT</> outside of a transaction block has no effect.
+   Issuing <command>ABORT</> outside of a transaction block
+   emits a warning and otherwise has no effect.
   </para>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/rollback.sgml b/doc/src/sgml/ref/rollback.sgml
index 4f7962117c..9a1529f0b4 100644
--- a/doc/src/sgml/ref/rollback.sgml
+++ b/doc/src/sgml/ref/rollback.sgml
@@ -60,7 +60,7 @@ ROLLBACK [ WORK | TRANSACTION ]
 
   <para>
    Issuing <command>ROLLBACK</> outside of a transaction
-   block has no effect.
+   block emits a warning and otherwise has no effect.
   </para>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml
index 5a84f697e6..aaad61eb4f 100644
--- a/doc/src/sgml/ref/set.sgml
+++ b/doc/src/sgml/ref/set.sgml
@@ -110,8 +110,9 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
      <para>
       Specifies that the command takes effect for only the current
       transaction.  After <command>COMMIT</> or <command>ROLLBACK</>,
-      the session-level setting takes effect again.  This has no effect
-      outside of a transaction block.
+      the session-level setting takes effect again.  Issuing this
+      outside of a transaction block emits a warning and otherwise has
+      no effect.
      </para>
     </listitem>
    </varlistentry>
diff --git a/doc/src/sgml/ref/set_constraints.sgml b/doc/src/sgml/ref/set_constraints.sgml
index a33190cca8..60cabeda3c 100644
--- a/doc/src/sgml/ref/set_constraints.sgml
+++ b/doc/src/sgml/ref/set_constraints.sgml
@@ -99,7 +99,8 @@ SET CONSTRAINTS { ALL | <replaceable class="parameter">name</replaceable> [, ...
 
   <para>
    This command only alters the behavior of constraints within the
-   current transaction.  This has no effect outside of a transaction block.
+   current transaction.  Issuing this outside of a transaction block
+   emits a warning and otherwise has no effect.
   </para>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/set_transaction.sgml b/doc/src/sgml/ref/set_transaction.sgml
index e90ff4af72..029b75a2bc 100644
--- a/doc/src/sgml/ref/set_transaction.sgml
+++ b/doc/src/sgml/ref/set_transaction.sgml
@@ -185,7 +185,7 @@ SET SESSION CHARACTERISTICS AS TRANSACTION <replaceable class="parameter">transa
   <para>
    If <command>SET TRANSACTION</command> is executed without a prior
    <command>START TRANSACTION</command> or <command>BEGIN</command>,
-   it will have no effect.
+   it emits a warning and otherwise has no effect.
   </para>
 
   <para>
-- 
2.40.0