Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rkOUH-00CRHG-5w for pgsql-committers@arkaria.postgresql.org; Wed, 13 Mar 2024 13:17:41 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1rkOUE-003Z20-HJ for pgsql-committers@arkaria.postgresql.org; Wed, 13 Mar 2024 13:17:39 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rkOUE-003Z1r-AI for pgsql-committers@lists.postgresql.org; Wed, 13 Mar 2024 13:17:38 +0000 Received: from mahout.postgresql.org ([2001:4800:3e1:1::227]) by makus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rkOUA-004IDP-Lb for pgsql-committers@lists.postgresql.org; Wed, 13 Mar 2024 13:17:37 +0000 Received: from gemulon.postgresql.org ([2001:4800:3e1:1::198]) by mahout.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rkOUA-00BG1W-3p for pgsql-committers@lists.postgresql.org; Wed, 13 Mar 2024 13:17:34 +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 1rkOU9-003bX3-BI for pgsql-committers@lists.postgresql.org; Wed, 13 Mar 2024 13:17:33 +0000 Content-Type: multipart/mixed; boundary="===============5086787695940630922==" MIME-Version: 1.0 From: Dean Rasheed To: pgsql-committers@lists.postgresql.org Subject: pgsql: doc: Improve a couple of places in the MERGE docs. X-Auto-Response-Suppress: All Auto-Submitted: auto-generated Message-Id: Date: Wed, 13 Mar 2024 13:17:33 +0000 List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --===============5086787695940630922== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 ZG9jOiBJbXByb3ZlIGEgY291cGxlIG9mIHBsYWNlcyBpbiB0aGUgTUVSR0UgZG9jcy4KCkluIHRo ZSBzeW5vcHNpcywgbWFrZSB0aGUgc3ludGF4IGZvciBtZXJnZV91cGRhdGUgY29uc2lzdGVudCB3 aXRoIHRoZQpzeW50YXggZm9yIGEgcGxhaW4gVVBEQVRFIGNvbW1hbmQuIEl0IHdhcyBtaXNzaW5n IHRoZSBvcHRpb25hbCAiUk9XIgprZXl3b3JkIHRoYXQgY2FuIGJlIHVzZWQgaW4gYSBtdWx0aS1j b2x1bW4gYXNzaWdubWVudCwgYW5kIHRoZSBvcHRpb24KdG8gYXNzaWduIGZyb20gYSBtdWx0aS1j b2x1bW4gc3VicXVlcnksIGJvdGggb2Ygd2hpY2ggaGF2ZSBiZWVuCnN1cHBvcnRlZCBieSBNRVJH RSBzaW5jZSBpdCB3YXMgaW50cm9kdWNlZC4KCkluIHRoZSBwYXJhbWV0ZXJzIHNlY3Rpb24gZm9y IHRoZSB3aXRoX3F1ZXJ5IHBhcmFtZXRlciwgbWVudGlvbiB0aGF0CldJVEggUkVDVVJTSVZFIGlz bid0IHN1cHBvcnRlZCwgc2luY2UgdGhpcyBpcyBkaWZmZXJlbnQgZnJvbSBwbGFpbgpJTlNFUlQs IFVQREFURSwgYW5kIERFTEVURSBjb21tYW5kcy4gV2hpbGUgYXQgaXQsIG1vdmUgdGhhdCBlbnRy eSB0bwp0aGUgdG9wIG9mIHRoZSBsaXN0LCBmb3IgY29uc2lzdGVuY3kgd2l0aCB0aGUgb3RoZXIg cGFnZXMuCgpCYWNrLXBhdGNoIHRvIHYxNSwgd2hlcmUgTUVSR0Ugd2FzIGludHJvZHVjZWQuCgpE aXNjdXNzaW9uOiBodHRwczovL3Bvc3Rnci5lcy9tL0NBRVpBVENXb1F5V2tNRmZ1N0pYWFFyOGRB NiUzRGd4amhZemdwdUJQMm96MFFvSlR4R1d3JTQwbWFpbC5nbWFpbC5jb20KCkJyYW5jaAotLS0t LS0KbWFzdGVyCgpEZXRhaWxzCi0tLS0tLS0KaHR0cHM6Ly9naXQucG9zdGdyZXNxbC5vcmcvcGcv Y29tbWl0ZGlmZi85N2Q0MjYyNjgzYWNiNTg2Nzc4YWYyYjJhMzcyMWZhN2NkYzQwMmYxCgpNb2Rp ZmllZCBGaWxlcwotLS0tLS0tLS0tLS0tLQpkb2Mvc3JjL3NnbWwvcmVmL21lcmdlLnNnbWwgfCAz NiArKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0KMSBmaWxlIGNoYW5nZWQsIDI4 IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgo= --===============5086787695940630922==--