From 9f16366d2712c30ad7fc9456bf4e445d44c1ccb2 Mon Sep 17 00:00:00 2001
From: asfernandes <asfernandes@users.sourceforge.net>
Date: Fri, 26 Apr 2013 15:29:48 +0000
Subject: [PATCH] Finish MERGE improvements documentation (CORE-2005,
 CORE-3020, CORE-3639).

---
 doc/WhatsNew                        | 6 +++++-
 doc/sql.extensions/README.merge.txt | 2 +-
 doc/sql.extensions/README.returning | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/doc/WhatsNew b/doc/WhatsNew
index c5dca4f218..28a9862249 100644
--- a/doc/WhatsNew
+++ b/doc/WhatsNew
@@ -31,6 +31,8 @@
 
     * Improvement CORE-3639
         Allow the use of multiple WHEN MATCHED / NOT MATCHED clauses in MERGE, as per the SQL 2008 specification
+      See also:
+        /doc/README.merge.txt
       Contributor(s):
         Adriano dos Santos Fernandes <adrianosf at gmail.com>
 
@@ -82,7 +84,7 @@
     * Improvement CORE-3020
         Add RETURNING ... INTO ... clause to the MERGE statement
       See also:
-        /doc/sql.extensions/README.returning
+        /doc/sql.extensions/README.returning, /doc/README.merge.txt
       Contributor(s):
         Adriano dos Santos Fernandes <adrianosf at gmail.com>
 
@@ -175,6 +177,8 @@
 
     * Improvement CORE-2005
         Support SQL 2008 syntax for MERGE statement with DELETE extension
+      See also:
+        /doc/README.merge.txt
       Contributor(s):
         Adriano dos Santos Fernandes <adrianosf at gmail.com>
 
diff --git a/doc/sql.extensions/README.merge.txt b/doc/sql.extensions/README.merge.txt
index 884fb4753e..9987407f50 100644
--- a/doc/sql.extensions/README.merge.txt
+++ b/doc/sql.extensions/README.merge.txt
@@ -24,7 +24,7 @@ MERGE statement
 
 	<merge when matched> ::=
 		WHEN MATCHED [ AND <condition> ] THEN
-			UPDATE SET <assignment list>
+			{ UPDATE SET <assignment list> | DELETE }
 
 	<merge when not matched> ::=
 		WHEN NOT MATCHED [ AND <condition> ] THEN
diff --git a/doc/sql.extensions/README.returning b/doc/sql.extensions/README.returning
index 7e282b5b34..8154cb3a9e 100644
--- a/doc/sql.extensions/README.returning
+++ b/doc/sql.extensions/README.returning
@@ -17,6 +17,7 @@ RETURNING clause
     UPDATE OR INSERT INTO ... VALUES (...) ... [RETURNING <column_list> [INTO <variable_list>]]
     UPDATE ... [RETURNING <column_list> [INTO <variable_list>]]
     DELETE FROM ... [RETURNING <column_list> [INTO <variable_list>]]
+    MERGE INTO ... [RETURNING <column_list> [INTO <variable_list>]]
 
   Scope:
     DSQL, PSQL