Skip to content

Commit 6bdf1a1

Browse files
committed
Fix collection of typos in the code and the documentation
Some words were duplicated while other places were grammatically incorrect, including one variable name in the code. Author: Otto Kekalainen, Justin Pryzby Discussion: https://postgr.es/m/[email protected]
1 parent ff8b37b commit 6bdf1a1

File tree

29 files changed

+40
-40
lines changed

29 files changed

+40
-40
lines changed

config/pkg.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ dnl Check to see whether a particular set of modules exists. Similar to
8686
dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
8787
dnl
8888
dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
89-
dnl only at the first occurence in configure.ac, so if the first place
89+
dnl only at the first occurrence in configure.ac, so if the first place
9090
dnl it's called might be skipped (such as if it is within an "if", you
9191
dnl have to call PKG_CHECK_EXISTS manually
9292
AC_DEFUN([PKG_CHECK_EXISTS],

contrib/pageinspect/expected/gist.out

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ SELECT * FROM gist_page_items(get_raw_page('test_gist_idx', 1), 'test_gist_idx')
5252
(5 rows)
5353

5454
-- gist_page_items_bytea prints the raw key data as a bytea. The output of that is
55-
-- platform-dependent (endianess), so omit the actual key data from the output.
55+
-- platform-dependent (endianness), so omit the actual key data from the output.
5656
SELECT itemoffset, ctid, itemlen FROM gist_page_items_bytea(get_raw_page('test_gist_idx', 0));
5757
itemoffset | ctid | itemlen
5858
------------+-----------+---------

contrib/pageinspect/sql/gist.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ SELECT * FROM gist_page_items(get_raw_page('test_gist_idx', 0), 'test_gist_idx')
2323
SELECT * FROM gist_page_items(get_raw_page('test_gist_idx', 1), 'test_gist_idx') LIMIT 5;
2424

2525
-- gist_page_items_bytea prints the raw key data as a bytea. The output of that is
26-
-- platform-dependent (endianess), so omit the actual key data from the output.
26+
-- platform-dependent (endianness), so omit the actual key data from the output.
2727
SELECT itemoffset, ctid, itemlen FROM gist_page_items_bytea(get_raw_page('test_gist_idx', 0));
2828

2929
DROP TABLE test_gist;

doc/src/sgml/config.sgml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4746,7 +4746,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
47464746
log file by reducing the value of this parameter. On a system with
47474747
low WAL activity, increasing it reduces the amount of requests necessary
47484748
to access WAL archives, something useful for example in cloud
4749-
environments where the amount of times an infrastructure is accessed
4749+
environments where the number of times an infrastructure is accessed
47504750
is taken into account.
47514751
</para>
47524752
</listitem>
@@ -7515,7 +7515,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
75157515
Including <literal>jsonlog</literal> in the
75167516
<varname>log_destination</varname> list provides a convenient way to
75177517
import log files into many different programs. This option emits log
7518-
lines in (<acronym>JSON</acronym>) format.
7518+
lines in <acronym>JSON</acronym> format.
75197519
</para>
75207520

75217521
<para>

doc/src/sgml/logicaldecoding.sgml

+5-5
Original file line numberDiff line numberDiff line change
@@ -832,10 +832,10 @@ typedef void (*LogicalDecodeSequenceCB) (struct LogicalDecodingContext *ctx,
832832
The <parameter>txn</parameter> parameter contains meta information about
833833
the transaction the sequence change is part of. Note however that for
834834
non-transactional increments, the transaction may be either NULL or not
835-
NULL, depending on if the transaction already has XID assigned.
836-
The <parameter>sequence_lsn</parameter> has WAL location of the sequence
837-
update. The <parameter>transactional</parameter> says if the sequence has
838-
to be replayed as part of the transaction or directly.
835+
NULL, depending on if the transaction already has an XID assigned.
836+
The <parameter>sequence_lsn</parameter> has the WAL location of the
837+
sequence update. <parameter>transactional</parameter> says if the
838+
sequence has to be replayed as part of the transaction or directly.
839839

840840
The <parameter>last_value</parameter>, <parameter>log_cnt</parameter> and
841841
<parameter>is_called</parameter> parameters describe the sequence change.
@@ -1264,7 +1264,7 @@ OutputPluginWrite(ctx, true);
12641264
streamed in blocks demarcated by <function>stream_start_cb</function>
12651265
and <function>stream_stop_cb</function> callbacks. Once all the decoded
12661266
changes are transmitted, the transaction can be committed using the
1267-
the <function>stream_commit_cb</function> callback
1267+
<function>stream_commit_cb</function> callback
12681268
(or possibly aborted using the <function>stream_abort_cb</function> callback).
12691269
If two-phase commits are supported, the transaction can be prepared using the
12701270
<function>stream_prepare_cb</function> callback,

doc/src/sgml/postgres-fdw.sgml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,7 @@ postgres=# SELECT postgres_fdw_disconnect_all();
10031003
it's passed to and used as <varname>application_name</varname>
10041004
in a foreign server, note that it will be truncated to less than
10051005
<symbol>NAMEDATALEN</symbol> characters and anything other than
1006-
than printable ASCII characters will be replaced with question
1006+
printable ASCII characters will be replaced with question
10071007
marks (<literal>?</literal>).
10081008
See <xref linkend="guc-application-name"/> for details.
10091009
</para>

src/backend/access/heap/pruneheap.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ typedef struct
6969
/*
7070
* Tuple visibility is only computed once for each tuple, for correctness
7171
* and efficiency reasons; see comment in heap_page_prune() for
72-
* details. This is of type int8[,] intead of HTSV_Result[], so we can use
72+
* details. This is of type int8[,] instead of HTSV_Result[], so we can use
7373
* -1 to indicate no visibility has been computed, e.g. for LP_DEAD items.
7474
*
7575
* Same indexing as ->marked.

src/backend/access/transam/xlog.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5870,7 +5870,7 @@ GetRedoRecPtr(void)
58705870
* full-page image to be included in the WAL record.
58715871
*
58725872
* The returned values are cached copies from backend-private memory, and
5873-
* possibly out-of-date or, indeed, uninitalized, in which case they will
5873+
* possibly out-of-date or, indeed, uninitialized, in which case they will
58745874
* be InvalidXLogRecPtr and false, respectively. XLogInsertRecord will
58755875
* re-check them against up-to-date values, while holding the WAL insert lock.
58765876
*/

src/backend/catalog/index.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -918,7 +918,7 @@ index_create(Relation heapRelation,
918918
indexRelationId = binary_upgrade_next_index_pg_class_oid;
919919
binary_upgrade_next_index_pg_class_oid = InvalidOid;
920920

921-
/* Overide the index relfilenode */
921+
/* Override the index relfilenode */
922922
if ((relkind == RELKIND_INDEX) &&
923923
(!OidIsValid(binary_upgrade_next_index_pg_class_relfilenode)))
924924
ereport(ERROR,

src/backend/commands/explain.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -3102,7 +3102,7 @@ show_memoize_info(MemoizeState *mstate, List *ancestors, ExplainState *es)
31023102
ListCell *lc;
31033103
List *context;
31043104
StringInfoData keystr;
3105-
char *seperator = "";
3105+
char *separator = "";
31063106
bool useprefix;
31073107
int64 memPeakKb;
31083108

@@ -3123,11 +3123,11 @@ show_memoize_info(MemoizeState *mstate, List *ancestors, ExplainState *es)
31233123
{
31243124
Node *expr = (Node *) lfirst(lc);
31253125

3126-
appendStringInfoString(&keystr, seperator);
3126+
appendStringInfoString(&keystr, separator);
31273127

31283128
appendStringInfoString(&keystr, deparse_expression(expr, context,
31293129
useprefix, false));
3130-
seperator = ", ";
3130+
separator = ", ";
31313131
}
31323132

31333133
if (es->format != EXPLAIN_FORMAT_TEXT)

src/backend/main/main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ startup_hacks(const char *progname)
247247
* leaving the default in place would make debugging harder.
248248
*
249249
* MINGW's own C runtime doesn't have _set_abort_behavior(). When
250-
* targetting Microsoft's UCRT with mingw, it never links to the debug
250+
* targeting Microsoft's UCRT with mingw, it never links to the debug
251251
* version of the library and thus doesn't need the call to
252252
* _set_abort_behavior() either.
253253
*/

src/backend/postmaster/bgworker.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ BackgroundWorkerStopNotifications(pid_t pid)
531531
* This is called during a normal ("smart" or "fast") database shutdown.
532532
* After this point, no new background workers will be started, so anything
533533
* that might be waiting for them needs to be kicked off its wait. We do
534-
* that by cancelling the bgworker registration entirely, which is perhaps
534+
* that by canceling the bgworker registration entirely, which is perhaps
535535
* overkill, but since we're shutting down it does not matter whether the
536536
* registration record sticks around.
537537
*

src/backend/replication/basebackup_sink.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* Forward begin_backup callback.
1919
*
2020
* Only use this implementation if you want the bbsink you're implementing to
21-
* share a buffer with the succesor bbsink.
21+
* share a buffer with the successor bbsink.
2222
*/
2323
void
2424
bbsink_forward_begin_backup(bbsink *sink)
@@ -43,7 +43,7 @@ bbsink_forward_begin_archive(bbsink *sink, const char *archive_name)
4343
/*
4444
* Forward archive_contents callback.
4545
*
46-
* Code that wants to use this should initalize its own bbs_buffer and
46+
* Code that wants to use this should initialize its own bbs_buffer and
4747
* bbs_buffer_length fields to the values from the successor sink. In cases
4848
* where the buffer isn't shared, the data needs to be copied before forwarding
4949
* the callback. We don't do try to do that here, because there's really no

src/backend/utils/adt/tsrank.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ calc_rank_or(const float *w, TSVector t, TSQuery q)
337337
}
338338
/*
339339
limit (sum(1/i^2),i=1,inf) = pi^2/6
340-
resj = sum(wi/i^2),i=1,noccurence,
340+
resj = sum(wi/i^2),i=1,noccurrence,
341341
wi - should be sorted desc,
342342
don't sort for now, just choose maximum weight. This should be corrected
343343
Oleg Bartunov

src/bin/pg_basebackup/pg_basebackup.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1722,7 +1722,7 @@ GetCopyDataEnd(size_t r, char *copybuf, size_t cursor)
17221722
*
17231723
* As a debugging aid, we try to give some hint about what kind of message
17241724
* provoked the failure. Perhaps this is not detailed enough, but it's not
1725-
* clear that it's worth expending any more code on what shoud be a
1725+
* clear that it's worth expending any more code on what should be a
17261726
* can't-happen case.
17271727
*/
17281728
static void

src/bin/pg_basebackup/t/010_pg_basebackup.pl

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
# For nearly all pg_basebackup invocations some options should be specified,
2424
# to keep test times reasonable. Using @pg_basebackup_defs as the first
25-
# element of the array passed to to IPC::Run interpolate the array (as it is
25+
# element of the array passed to IPC::Run interpolate the array (as it is
2626
# not a reference to an array)...
2727
my @pg_basebackup_defs = ('pg_basebackup', '--no-sync', '-cfast');
2828

@@ -287,7 +287,7 @@
287287
SKIP:
288288
{
289289
my $tar = $ENV{TAR};
290-
# don't check for a working tar here, to accomodate various odd
290+
# don't check for a working tar here, to accommodate various odd
291291
# cases such as AIX. If tar doesn't work the init_from_backup below
292292
# will fail.
293293
skip "no tar program available", 1

src/bin/pg_verifybackup/t/008_untar.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595

9696
SKIP: {
9797
my $tar = $ENV{TAR};
98-
# don't check for a working tar here, to accomodate various odd
98+
# don't check for a working tar here, to accommodate various odd
9999
# cases such as AIX. If tar doesn't work the init_from_backup below
100100
# will fail.
101101
skip "no tar program available", 1

src/bin/pg_verifybackup/t/010_client_untar.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696

9797
SKIP: {
9898
my $tar = $ENV{TAR};
99-
# don't check for a working tar here, to accomodate various odd
99+
# don't check for a working tar here, to accommodate various odd
100100
# cases such as AIX. If tar doesn't work the init_from_backup below
101101
# will fail.
102102
skip "no tar program available", 1

src/bin/pgbench/pgbench.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4183,7 +4183,7 @@ initGenerateDataClientSide(PGconn *con)
41834183
* accounts is big enough to be worth using COPY and tracking runtime
41844184
*/
41854185

4186-
/* use COPY with FREEZE on v14 and later without partioning */
4186+
/* use COPY with FREEZE on v14 and later without partitioning */
41874187
if (partitions == 0 && PQserverVersion(con) >= 140000)
41884188
copy_statement = "copy pgbench_accounts from stdin with (freeze on)";
41894189
else

src/include/libpq/sasl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ typedef struct pg_be_sasl_mech
6262
* must return a pointer to its allocated state, which will be passed
6363
* as-is as the first argument to the other callbacks.
6464
*
65-
* Input paramters:
65+
* Input parameters:
6666
*
6767
* port: The client Port.
6868
*

src/interfaces/libpq/t/001_uri.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ sub test_uri
232232
chomp($result{stderr});
233233

234234
# use is_deeply so there's one test result for each test above, without
235-
# loosing the information whether stdout/stderr mismatched.
235+
# losing the information whether stdout/stderr mismatched.
236236
is_deeply(\%result, \%expect, $uri);
237237
}
238238

src/test/perl/PostgreSQL/Test/Cluster.pm

+3-3
Original file line numberDiff line numberDiff line change
@@ -1372,9 +1372,9 @@ sub _set_pg_version
13721372
# local %ENV = $self->_get_env{[%extra_settings]);
13731373
#
13741374
# A copy of the environment is taken and node's host and port settings are
1375-
# added as PGHOST and PGPORT, Then the extra settings (if any) are applied.
1376-
# Any setting in %extra_settings with a value that is undefined is deleted
1377-
# the remainder are# set. Then the PATH and (DY)LD_LIBRARY_PATH are adjusted
1375+
# added as PGHOST and PGPORT, then the extra settings (if any) are applied.
1376+
# Any setting in %extra_settings with a value that is undefined is deleted;
1377+
# the remainder are set. Then the PATH and (DY)LD_LIBRARY_PATH are adjusted
13781378
# if the node's install path is set, and the copy environment is returned.
13791379
#
13801380
# The install path set in new() needs to be a directory containing

src/test/regress/expected/create_function_sql.out

+1-1
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ CREATE FUNCTION functest_S_13() RETURNS boolean
279279
SELECT 1;
280280
SELECT false;
281281
END;
282-
-- check display of function argments in sub-SELECT
282+
-- check display of function arguments in sub-SELECT
283283
CREATE TABLE functest1 (i int);
284284
CREATE FUNCTION functest_S_16(a int, b int) RETURNS void
285285
LANGUAGE SQL

src/test/regress/expected/create_table.out

+1-1
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ create table parted_notnull_inh_test1 partition of parted_notnull_inh_test (a no
811811
insert into parted_notnull_inh_test (b) values (null);
812812
ERROR: null value in column "b" of relation "parted_notnull_inh_test1" violates not-null constraint
813813
DETAIL: Failing row contains (1, null).
814-
-- note that while b's default is overriden, a's default is preserved
814+
-- note that while b's default is overridden, a's default is preserved
815815
\d parted_notnull_inh_test1
816816
Table "public.parted_notnull_inh_test1"
817817
Column | Type | Collation | Nullable | Default

src/test/regress/expected/object_address.out

+1-1
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ WITH objects (classid, objid, objsubid) AS (VALUES
558558
('pg_namespace'::regclass, 0, 0), -- no schema
559559
('pg_statistic_ext'::regclass, 0, 0), -- no statistics
560560
('pg_ts_parser'::regclass, 0, 0), -- no TS parser
561-
('pg_ts_dict'::regclass, 0, 0), -- no TS dictionnary
561+
('pg_ts_dict'::regclass, 0, 0), -- no TS dictionary
562562
('pg_ts_template'::regclass, 0, 0), -- no TS template
563563
('pg_ts_config'::regclass, 0, 0), -- no TS configuration
564564
('pg_authid'::regclass, 0, 0), -- no role

src/test/regress/sql/create_function_sql.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ CREATE FUNCTION functest_S_13() RETURNS boolean
180180
SELECT false;
181181
END;
182182

183-
-- check display of function argments in sub-SELECT
183+
-- check display of function arguments in sub-SELECT
184184
CREATE TABLE functest1 (i int);
185185
CREATE FUNCTION functest_S_16(a int, b int) RETURNS void
186186
LANGUAGE SQL

src/test/regress/sql/create_table.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ CREATE TABLE part_c_1_10 PARTITION OF part_c FOR VALUES FROM (1) TO (10);
559559
create table parted_notnull_inh_test (a int default 1, b int not null default 0) partition by list (a);
560560
create table parted_notnull_inh_test1 partition of parted_notnull_inh_test (a not null, b default 1) for values in (1);
561561
insert into parted_notnull_inh_test (b) values (null);
562-
-- note that while b's default is overriden, a's default is preserved
562+
-- note that while b's default is overridden, a's default is preserved
563563
\d parted_notnull_inh_test1
564564
drop table parted_notnull_inh_test;
565565

src/test/regress/sql/object_address.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ WITH objects (classid, objid, objsubid) AS (VALUES
259259
('pg_namespace'::regclass, 0, 0), -- no schema
260260
('pg_statistic_ext'::regclass, 0, 0), -- no statistics
261261
('pg_ts_parser'::regclass, 0, 0), -- no TS parser
262-
('pg_ts_dict'::regclass, 0, 0), -- no TS dictionnary
262+
('pg_ts_dict'::regclass, 0, 0), -- no TS dictionary
263263
('pg_ts_template'::regclass, 0, 0), -- no TS template
264264
('pg_ts_config'::regclass, 0, 0), -- no TS configuration
265265
('pg_authid'::regclass, 0, 0), -- no role

src/test/subscription/t/001_rep_changes.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@
418418
# application_name to ensure that the walsender is (re)started.
419419
#
420420
# Not all of these are registered as tests as we need to poll for a change
421-
# but the test suite will fail none the less when something goes wrong.
421+
# but the test suite will fail nonetheless when something goes wrong.
422422
my $oldpid = $node_publisher->safe_psql('postgres',
423423
"SELECT pid FROM pg_stat_replication WHERE application_name = 'tap_sub' AND state = 'streaming';"
424424
);

0 commit comments

Comments
 (0)