Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ovatW-0006A5-9L for pgsql-committers@arkaria.postgresql.org; Thu, 17 Nov 2022 09:09:14 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1ovatU-0005xM-JW for pgsql-committers@arkaria.postgresql.org; Thu, 17 Nov 2022 09:09:12 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ovatU-0005xD-7M for pgsql-committers@lists.postgresql.org; Thu, 17 Nov 2022 09:09:12 +0000 Received: from mahout.postgresql.org ([2001:4800:3e1:1::227]) by makus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ovatN-0004ZI-ED for pgsql-committers@lists.postgresql.org; Thu, 17 Nov 2022 09:09:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=postgresql.org; s=20171124; h=Date:Message-Id:Subject:To:From:MIME-Version: Content-Type:Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID: Content-Description:In-Reply-To:References; bh=rTwfNGvZpavptrgw8zZgVx0WqhESSUFFOIAMmXtcpiU=; b=K502+FksaEm11CrJLrehjwXQqe FXs46lsX+zg5zHGSkt2/VBSXErk24YS3bI7TW+TZtP+CBEse9ppdrjpxCfNuLHl+JdwQKXN1lHPKR 7PpEWfBFwjpfNRtsaEERzEZZF1zfyWzLXLthuQ0VfUJwfBIhj1IM63TKCwOBYCwfeC2oL5ZK29K4F zVkOf46ePruYj2/Qh8opEfOiQxTbB2jOpr2kAG6Ziu6paivMobUKaFIj7KoT7JpsgV9iDoxEb2nlQ NEPAA5RfTtUXrkuLU4WYpWf2si09QhxD+n/wy6L51mwEXKSa+5mKQ1j/87xb6DNI/bdmvruVy0xE/ I8llwn/Q==; Received: from gemulon.postgresql.org ([2001:4800:3e1:1::198]) by mahout.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ovatM-0002Ql-Ot for pgsql-committers@lists.postgresql.org; Thu, 17 Nov 2022 09:09:04 +0000 Received: from localhost ([127.0.0.1] helo=gemulon.postgresql.org) by gemulon.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1ovatK-000Zrt-VW for pgsql-committers@lists.postgresql.org; Thu, 17 Nov 2022 09:09:03 +0000 Content-Type: multipart/mixed; boundary="===============6323920399672177614==" MIME-Version: 1.0 From: Daniel Gustafsson To: pgsql-committers@lists.postgresql.org Subject: pgsql: doc: Fix wording of MERGE actions in README X-Auto-Response-Suppress: All Auto-Submitted: auto-generated Message-Id: Date: Thu, 17 Nov 2022 09:09:03 +0000 List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --===============6323920399672177614== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 ZG9jOiBGaXggd29yZGluZyBvZiBNRVJHRSBhY3Rpb25zIGluIFJFQURNRQoKVVBEQVRFIHdhcyBs aXN0ZWQgdHdpY2UgYW5kIERFTEVURSB3YXMgb21pdHRlZCwgcmVwbGFjZSBvbmUgVVBEQVRFCndp dGggREVMRVRFIGluc3RlYWQuCgpCYWNrcGF0Y2ggdGhyb3VnaCB2MTUgd2hlcmUgTUVSR0Ugd2Fz IGFkZGVkLgoKQXV0aG9yOiBNeW8gV2FpIFRoYW50IDxteW8ud2FpdGhhbnRAZnVqaXRzdS5jb20+ ClJldmlld2VkLWJ5OiBSaWNoYXJkIEd1byA8Z3VvZmVuZ2xpbnV4QGdtYWlsLmNvbT4KRGlzY3Vz c2lvbjogaHR0cHM6Ly9wb3N0Z3IuZXMvbS9PU0FQUjAxTUI0MzI0N0U0NjkzMUU5RTlDRkM0QUEw RjI5QTA3OUBPU0FQUjAxTUI0MzI0LmpwbnByZDAxLnByb2Qub3V0bG9vay5jb20KQmFja3BhdGNo LXRocm91Z2g6IDE1CgpCcmFuY2gKLS0tLS0tCm1hc3RlcgoKRGV0YWlscwotLS0tLS0tCmh0dHBz Oi8vZ2l0LnBvc3RncmVzcWwub3JnL3BnL2NvbW1pdGRpZmYvM2IzMDQ1NDdhOWRmZWY3MTAxODg5 ZDM1YTRjNWRhNzg2NmQ2NmM4ZQoKTW9kaWZpZWQgRmlsZXMKLS0tLS0tLS0tLS0tLS0Kc3JjL2Jh Y2tlbmQvZXhlY3V0b3IvUkVBRE1FIHwgMiArLQoxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24o KyksIDEgZGVsZXRpb24oLSkKCg== --===============6323920399672177614==--