Return-Path: 
 <derby-commits-return-18459-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
X-Original-To: apmail-db-derby-commits-archive@www.apache.org
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 53B9E11793
	for <apmail-db-derby-commits-archive@www.apache.org>;
 Thu, 10 Jul 2014 15:28:07 +0000 (UTC)
Received: (qmail 69501 invoked by uid 500); 10 Jul 2014 15:28:07 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 69474 invoked by uid 500); 10 Jul 2014 15:28:07 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:derby-commits-help@db.apache.org>
list-unsubscribe: <mailto:derby-commits-unsubscribe@db.apache.org>
List-Post: <mailto:derby-commits@db.apache.org>
Reply-To: "Derby Development" <derby-dev@db.apache.org>
List-Id: <derby-commits.db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 69463 invoked by uid 99); 10 Jul 2014 15:28:07 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jul 2014 15:28:07 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jul 2014 15:28:08 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id A4CAC238899C;
	Thu, 10 Jul 2014 15:27:43 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1609482 -
 /db/derby/docs/trunk/src/ref/rrefsqljmerge.dita
Date: Thu, 10 Jul 2014 15:27:43 -0000
To: derby-commits@db.apache.org
From: chaase3@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140710152743.A4CAC238899C@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: chaase3
Date: Thu Jul 10 15:27:43 2014
New Revision: 1609482

URL: http://svn.apache.org/r1609482
Log:
DERBY-6657  Need to document the fact that views can't be the source data sets of MERGE statements

Modified a Reference Manual topic.

Patch: DERBY-6657.diff

Modified:
    db/derby/docs/trunk/src/ref/rrefsqljmerge.dita

Modified: db/derby/docs/trunk/src/ref/rrefsqljmerge.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljmerge.dita?rev=1609482&r1=1609481&r2=1609482&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljmerge.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljmerge.dita Thu Jul 10 15:27:43 2014
@@ -40,8 +40,8 @@ ON <i>searchCondition <xref href="rrefsq
 <i><xref href="rreftablename.dita"></xref></i>s.</p>
 <p><i>targetTable</i> must identify a base table. <i>targetTable</i> may not be
 a transition table in a triggered statement, and it may not be a synonym.</p>
-<p> <i>sourceTable</i> must identify a base table, a view, or a table function,
-and it may not be a synonym.</p>
+<p> <i>sourceTable</i> must identify a base table or a table function, and it
+may not be a synonym.</p>
 <p>Both <i>targetCorrelationName</i> and <i>sourceCorrelationName</i> are
 <i><xref href="rrefcorrelationname.dita"></xref></i>s.</p>
 <p>The unqualified source table name (or its correlation name) may not be the