To: "pgsql-docs@postgresql.org" <pgsql-docs@postgresql.org>
From: Alexander Law <exclusion@gmail.com>
Subject: Several repeated words
Message-ID: <aaae74c3-a8ee-bd85-a160-ad2d4d6b8ee7@gmail.com>
Date: Tue, 16 Aug 2016 19:02:41 +0300
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
 Thunderbird/45.2.0
MIME-Version: 1.0
Content-Type: multipart/mixed;
 boundary="------------96D9BCDC1096FFE5848E2839"
Precedence: bulk
Sender: pgsql-docs-owner@postgresql.org

This is a multi-part message in MIME format.
--------------96D9BCDC1096FFE5848E2839
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit

Hello,

There are some occurrences of repeated words in the docs. Patches attached.

Also, please consider fixing 'and and' and 'the the' in the source code 
and regression test comments.

Best regards,
Alexander


--------------96D9BCDC1096FFE5848E2839
Content-Type: text/x-patch;
 name="runtime.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="runtime.patch"

diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index 66fbe44..60a0659 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -184,7 +184,7 @@ postgres$ <userinput>initdb -D /usr/local/pgsql/data</userinput>
   </para>
 
   <para>
-   Non-<literal>C</> and and non-<literal>POSIX</> locales rely on the
+   Non-<literal>C</> and non-<literal>POSIX</> locales rely on the
    operating system's collation library for character set ordering.
    This controls the ordering of keys stored in indexes.  For this reason,
    a cluster cannot switch to an incompatible collation library version,

--------------96D9BCDC1096FFE5848E2839
Content-Type: text/x-patch;
 name="release-9.6.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="release-9.6.patch"

diff --git a/doc/src/sgml/release-9.6.sgml b/doc/src/sgml/release-9.6.sgml
index cc886fa..9003b1f 100644
--- a/doc/src/sgml/release-9.6.sgml
+++ b/doc/src/sgml/release-9.6.sgml
@@ -1026,7 +1026,7 @@ This commit is also listed under libpq and psql
 
        <para>
         This view exposes the same information available from
-        the the <application>pg_config</> comand-line utility,
+        the <application>pg_config</> comand-line utility,
         namely assorted compile-time configuration information for
         <productname>PostgreSQL</>.
        </para>

--------------96D9BCDC1096FFE5848E2839
Content-Type: text/x-patch;
 name="no-and-and.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="no-and-and.patch"

diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c
index c2e4fa3..0c8c17a 100644
--- a/src/backend/access/transam/multixact.c
+++ b/src/backend/access/transam/multixact.c
@@ -2802,7 +2802,7 @@ ReadMultiXactCounts(uint32 *multixacts, MultiXactOffset *members)
  * more aggressive in clamping this value.  That not only causes autovacuum
  * to ramp up, but also makes any manual vacuums the user issues more
  * aggressive.  This happens because vacuum_set_xid_limits() clamps the
- * freeze table and and the minimum freeze age based on the effective
+ * freeze table and the minimum freeze age based on the effective
  * autovacuum_multixact_freeze_max_age this function returns.  In the worst
  * case, we'll claim the freeze_max_age to zero, and every vacuum of any
  * table will try to freeze every multixact.
diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c
index c0a4a06..3d11a1c 100644
--- a/src/backend/utils/adt/tsquery.c
+++ b/src/backend/utils/adt/tsquery.c
@@ -691,7 +691,7 @@ parse_tsquery(char *buf,
 	findoprnd(ptr, query->size, &needcleanup);
 
 	/*
-	 * QI_VALSTOP nodes should be cleaned and and OP_PHRASE should be pushed
+	 * QI_VALSTOP nodes should be cleaned and OP_PHRASE should be pushed
 	 * down
 	 */
 	if (needcleanup)

--------------96D9BCDC1096FFE5848E2839
Content-Type: text/x-patch;
 name="no-the-the.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="no-the-the.patch"

diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
index 996ebcd..f66b443 100644
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -390,7 +390,7 @@ INSERT INTO atest5(two) VALUES (6) ON CONFLICT (two) DO UPDATE set one = 8; -- f
 ERROR:  permission denied for relation atest5
 INSERT INTO atest5(three) VALUES (4) ON CONFLICT (two) DO UPDATE set three = 10; -- fails (due to INSERT)
 ERROR:  permission denied for relation atest5
--- Check that the the columns in the inference require select privileges
+-- Check that the columns in the inference require select privileges
 -- Error. No privs on four
 INSERT INTO atest5(three) VALUES (4) ON CONFLICT (four) DO UPDATE set three = 10;
 ERROR:  permission denied for relation atest5
diff --git a/src/test/regress/sql/privileges.sql b/src/test/regress/sql/privileges.sql
index 0aa9c67..00dc7bd 100644
--- a/src/test/regress/sql/privileges.sql
+++ b/src/test/regress/sql/privileges.sql
@@ -259,7 +259,7 @@ INSERT INTO atest5(two) VALUES (6) ON CONFLICT (two) DO UPDATE set three = EXCLU
 INSERT INTO atest5(two) VALUES (6) ON CONFLICT (two) DO UPDATE set three = EXCLUDED.three;
 INSERT INTO atest5(two) VALUES (6) ON CONFLICT (two) DO UPDATE set one = 8; -- fails (due to UPDATE)
 INSERT INTO atest5(three) VALUES (4) ON CONFLICT (two) DO UPDATE set three = 10; -- fails (due to INSERT)
--- Check that the the columns in the inference require select privileges
+-- Check that the columns in the inference require select privileges
 -- Error. No privs on four
 INSERT INTO atest5(three) VALUES (4) ON CONFLICT (four) DO UPDATE set three = 10;
 

--------------96D9BCDC1096FFE5848E2839
Content-Type: text/plain
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0


-- 
Sent via pgsql-docs mailing list (pgsql-docs@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-docs

--------------96D9BCDC1096FFE5848E2839--