Fix typos

From: Alexander Law <exclusion@gmail.com>

diff --git a/doc/src/sgml/release-9.6.sgml b/doc/src/sgml/release-9.6.sgml
index cc886fa2bb2e6c0d9cfb931b635034517a0c1a06..9003b1f6e4f09a2eff528ce24f1e05010d66bdf0 100644 (file)
--- 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>

diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index 8ba95e1b84f7dce57e3c74e815a90fd95fb4af68..9007987dab5897a1eea7d0e55f896a17cdff46ad 100644 (file)
--- 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,

diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c
index c2e4fa377d570150e0523b7fd4ecbc364c1edc8e..0c8c17af33c5b8321ccdea64367bae55923a317b 100644 (file)
--- 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 c0a4a0606bce074a16e1218adb69aff4d349d5b5..3d11a1c2080b89396a3bc0955eb0f6a4b8ee1298 100644 (file)
--- 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)

diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
index 996ebcdca227db9e07bd02c19213f3a00b5ab1e0..f66b4432a1567b162035ba9d8a91cb9d7eb96542 100644 (file)
--- 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 0aa9c672d554a049f5d2a05bcfeaefe2977e397f..00dc7bd4ab203e54e834ba5b561e63fcbf9640ab 100644 (file)
--- 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;