diff options
71 files changed, 81 insertions, 81 deletions
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index 8154cae7bd..84d7c49258 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -1795,7 +1795,7 @@ dblink_current_query(PG_FUNCTION_ARGS) /* * Retrieve async notifications for a connection. * - * Returns an setof record of notifications, or an empty set if none recieved. + * Returns an setof record of notifications, or an empty set if none received. * Can optionally take a named connection as parameter, but uses the unnamed connection per default. * */ diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.c b/contrib/fuzzystrmatch/fuzzystrmatch.c index b9c2165210..8a1771b970 100644 --- a/contrib/fuzzystrmatch/fuzzystrmatch.c +++ b/contrib/fuzzystrmatch/fuzzystrmatch.c @@ -157,7 +157,7 @@ getcode(char c) /* These letters are passed through unchanged */ #define NOCHANGE(c) (getcode(c) & 2) /* FJMNR */ -/* These form dipthongs when preceding H */ +/* These form diphthongs when preceding H */ #define AFFECTH(c) (getcode(c) & 4) /* CGPST */ /* These make C and G soft */ diff --git a/contrib/fuzzystrmatch/levenshtein.c b/contrib/fuzzystrmatch/levenshtein.c index 40035ca78c..90d4f2169d 100644 --- a/contrib/fuzzystrmatch/levenshtein.c +++ b/contrib/fuzzystrmatch/levenshtein.c @@ -171,7 +171,7 @@ levenshtein_internal(text *s, text *t, * length. Each additional deletion forces another insertion, so * the best-case total cost increases by ins_c + del_c. If the * string is shrinking, the minimum theoretical cost assumes no - * excess deletions; that is, we're starting no futher right than + * excess deletions; that is, we're starting no further right than * column n - m. If we do start further right, the best-case * total cost increases by ins_c + del_c for each move right. */ diff --git a/contrib/hstore/hstore_io.c b/contrib/hstore/hstore_io.c index 0eb48cf580..dde6c4b376 100644 --- a/contrib/hstore/hstore_io.c +++ b/contrib/hstore/hstore_io.c @@ -74,7 +74,7 @@ get_val(HSParser *state, bool ignoreeq, bool *escaped) } else if (*(state->ptr) == '=' && !ignoreeq) { - elog(ERROR, "Syntax error near '%c' at postion %d", *(state->ptr), (int4) (state->ptr - state->begin)); + elog(ERROR, "Syntax error near '%c' at position %d", *(state->ptr), (int4) (state->ptr - state->begin)); } else if (*(state->ptr) == '\\') { diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c index e0e3a9f0f5..5b2b9eb28c 100644 --- a/contrib/pg_upgrade/info.c +++ b/contrib/pg_upgrade/info.c @@ -234,7 +234,7 @@ get_db_infos(ClusterInfo *cluster) /* * get_rel_infos() * - * gets the relinfos for all the user tables of the database refered + * gets the relinfos for all the user tables of the database referred * by "db". * * NOTE: we assume that relations/entities with oids greater than diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c index fa48ef18dc..cc74f11808 100644 --- a/contrib/pg_upgrade/pg_upgrade.c +++ b/contrib/pg_upgrade/pg_upgrade.c @@ -15,7 +15,7 @@ * oids are the same between old and new clusters. This is important * because toast oids are stored as toast pointers in user tables. * - * FYI, while pg_class.oid and pg_class.relfilenode are intially the same + * FYI, while pg_class.oid and pg_class.relfilenode are initially the same * in a cluster, but they can diverge due to CLUSTER, REINDEX, or VACUUM * FULL. The new cluster will have matching pg_class.oid and * pg_class.relfilenode values and be based on the old oid value. This can diff --git a/contrib/pg_upgrade/version_old_8_3.c b/contrib/pg_upgrade/version_old_8_3.c index c60374ee9b..542425c7c9 100644 --- a/contrib/pg_upgrade/version_old_8_3.c +++ b/contrib/pg_upgrade/version_old_8_3.c @@ -396,7 +396,7 @@ old_8_3_rebuild_tsvector_tables(ClusterInfo *cluster, bool check_mode) PQclear(res); - /* XXX Mark tables as not accessable somehow */ + /* XXX Mark tables as not accessible somehow */ PQfinish(conn); } @@ -666,7 +666,7 @@ old_8_3_invalidate_bpchar_pattern_ops_indexes(ClusterInfo *cluster, * we don't transfer sequence files but instead use the CREATE SEQUENCE * command from the schema dump, and use setval() to restore the sequence * value and 'is_called' from the old database. This is safe to run - * by pg_upgrade because sequence files are not transfered from the old + * by pg_upgrade because sequence files are not transferred from the old * server, even in link mode. */ char * diff --git a/contrib/pgcrypto/crypt-des.c b/contrib/pgcrypto/crypt-des.c index 44475a1b44..cea80b55e9 100644 --- a/contrib/pgcrypto/crypt-des.c +++ b/contrib/pgcrypto/crypt-des.c @@ -711,7 +711,7 @@ px_crypt_des(const char *key, const char *setting) /* * Double check that we weren't given a short setting. If we were, the - * above code will probably have created wierd values for count and + * above code will probably have created weird values for count and * salt, but we don't really care. Just make sure the output string * doesn't have an extra NUL in it. */ diff --git a/contrib/pgcrypto/imath.c b/contrib/pgcrypto/imath.c index de24076322..3286cd9d80 100644 --- a/contrib/pgcrypto/imath.c +++ b/contrib/pgcrypto/imath.c @@ -647,7 +647,7 @@ mp_int_add(mp_int a, mp_int b, mp_int c) /* Different signs -- subtract magnitudes, preserve sign of greater */ mp_int x, y; - int cmp = s_ucmp(a, b); /* magnitude comparision, sign ignored */ + int cmp = s_ucmp(a, b); /* magnitude comparison, sign ignored */ /* Set x to max(a, b), y to min(a, b) to simplify later code */ if (cmp >= 0) diff --git a/contrib/pgcrypto/pgp-pgsql.c b/contrib/pgcrypto/pgp-pgsql.c index c4c6b50977..d4eec03cc7 100644 --- a/contrib/pgcrypto/pgp-pgsql.c +++ b/contrib/pgcrypto/pgp-pgsql.c @@ -625,7 +625,7 @@ out: px_set_debug_handler(NULL); /* - * add successfull decryptions also into RNG + * add successful decryptions also into RNG */ add_entropy(res, key, keypsw); diff --git a/contrib/sepgsql/label.c b/contrib/sepgsql/label.c index deadd88b04..85f4efe072 100644 --- a/contrib/sepgsql/label.c +++ b/contrib/sepgsql/label.c @@ -74,7 +74,7 @@ typedef struct { * sepgsql_get_client_label * * Returns the current security label of the client. All code should use this - * routine to get the current label, instead of refering to the client_label_* + * routine to get the current label, instead of referring to the client_label_* * variables above. */ char * diff --git a/contrib/sslinfo/sslinfo.c b/contrib/sslinfo/sslinfo.c index b5fd7ec987..7a5847004b 100644 --- a/contrib/sslinfo/sslinfo.c +++ b/contrib/sslinfo/sslinfo.c @@ -132,7 +132,7 @@ ssl_client_serial(PG_FUNCTION_ARGS) * current database encoding if possible. Any invalid characters are * replaced by question marks. * - * Parameter: str - OpenSSL ASN1_STRING structure. Memory managment + * Parameter: str - OpenSSL ASN1_STRING structure. Memory management * of this structure is responsibility of caller. * * Returns Datum, which can be directly returned from a C language SQL diff --git a/doc/src/sgml/release-7.4.sgml b/doc/src/sgml/release-7.4.sgml index f13957b026..b9e4160653 100644 --- a/doc/src/sgml/release-7.4.sgml +++ b/doc/src/sgml/release-7.4.sgml @@ -1149,7 +1149,7 @@ </para> <para> - An explictly casted constant would be shown incorrectly. This could + An explicitly casted constant would be shown incorrectly. This could for example lead to corruption of a view definition during dump and reload. </para> diff --git a/doc/src/sgml/release-8.0.sgml b/doc/src/sgml/release-8.0.sgml index 5d6d60e607..dd7652ba6d 100644 --- a/doc/src/sgml/release-8.0.sgml +++ b/doc/src/sgml/release-8.0.sgml @@ -1539,7 +1539,7 @@ </para> <para> - An explictly casted constant would be shown incorrectly. This could + An explicitly casted constant would be shown incorrectly. This could for example lead to corruption of a view definition during dump and reload. </para> diff --git a/doc/src/sgml/release-8.1.sgml b/doc/src/sgml/release-8.1.sgml index 5f74abf45e..ac0e05ea77 100644 --- a/doc/src/sgml/release-8.1.sgml +++ b/doc/src/sgml/release-8.1.sgml @@ -1991,7 +1991,7 @@ </para> <para> - An explictly casted constant would be shown incorrectly. This could + An explicitly casted constant would be shown incorrectly. This could for example lead to corruption of a view definition during dump and reload. </para> diff --git a/doc/src/sgml/release-8.2.sgml b/doc/src/sgml/release-8.2.sgml index a75ed44981..a14f74686b 100644 --- a/doc/src/sgml/release-8.2.sgml +++ b/doc/src/sgml/release-8.2.sgml @@ -3544,7 +3544,7 @@ </para> <para> - An explictly casted constant would be shown incorrectly. This could + An explicitly casted constant would be shown incorrectly. This could for example lead to corruption of a view definition during dump and reload. </para> diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 26b2d5e4a9..51c2102b74 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -534,8 +534,8 @@ $(top_builddir)/src/Makefile.global: $(top_srcdir)/src/Makefile.global.in $(top_ # config.status will not change the timestamp on pg_config.h if it # doesn't change, so as to avoid recompiling the entire tree # unnecessarily. Therefore we make config.status update a timestamp file -# stamp-h everytime it runs, so that we don't trigger this rule everytime. -# (We do trigger the null rule for stamp-h to pg_config.h everytime; so it's +# stamp-h every time it runs, so that we don't trigger this rule every time. +# (We do trigger the null rule for stamp-h to pg_config.h every time; so it's # important for that rule to be null!) # # Of course you need to turn on dependency tracking to get any diff --git a/src/backend/access/gin/ginentrypage.c b/src/backend/access/gin/ginentrypage.c index a9482da3fb..70fcddfe40 100644 --- a/src/backend/access/gin/ginentrypage.c +++ b/src/backend/access/gin/ginentrypage.c @@ -447,9 +447,9 @@ entryIsEnoughSpace(GinBtree btree, Buffer buf, OffsetNumber off) } /* - * Delete tuple on leaf page if tuples was existed and we + * Delete tuple on leaf page if tuples existed and we * should update it, update old child blkno to new right page - * if child split is occured + * if child split occurred */ static BlockNumber entryPreparePage(GinBtree btree, Page page, OffsetNumber off) diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c index d201c68f72..b9bfde2ee4 100644 --- a/src/backend/access/gin/ginfast.c +++ b/src/backend/access/gin/ginfast.c @@ -856,7 +856,7 @@ ginInsertCleanup(GinState *ginstate, * added to it. If so, process those entries immediately. There * shouldn't be very many, so we don't worry about the fact that * we're doing this with exclusive lock. Insertion algorithm - * gurantees that inserted row(s) will not continue on next page. + * guarantees that inserted row(s) will not continue on next page. * NOTE: intentionally no vacuum_delay_point in this loop. */ if (PageGetMaxOffsetNumber(page) != maxoff) diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index 3b7894e8f1..98d1e559d3 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -1580,7 +1580,7 @@ heap_hot_search_buffer(ItemPointer tid, Relation relation, Buffer buffer, break; /* - * When first_call is true (and thus, skip is initally false) we'll + * When first_call is true (and thus, skip is initially false) we'll * return the first tuple we find. But on later passes, heapTuple * will initially be pointing to the tuple we returned last time. * Returning it again would be incorrect (and would loop forever), diff --git a/src/backend/access/nbtree/README b/src/backend/access/nbtree/README index 561ffbb9d4..edf33d90b1 100644 --- a/src/backend/access/nbtree/README +++ b/src/backend/access/nbtree/README @@ -373,7 +373,7 @@ leaf-item deletions (if the deletion brings the leaf page to zero items, it is now a candidate to be deleted, but that is a separate action). An insertion that causes a page split is logged as a single WAL entry for -the changes occuring on the insertion's level --- including update of the +the changes occurring on the insertion's level --- including update of the right sibling's left-link --- followed by a second WAL entry for the insertion on the parent level (which might itself be a page split, requiring an additional insertion above that, etc). diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c index 0f4cea124d..8bdf387917 100644 --- a/src/backend/access/transam/multixact.c +++ b/src/backend/access/transam/multixact.c @@ -173,7 +173,7 @@ static MultiXactId *OldestVisibleMXactId; * Definitions for the backend-local MultiXactId cache. * * We use this cache to store known MultiXacts, so we don't need to go to - * SLRU areas everytime. + * SLRU areas every time. * * The cache lasts for the duration of a single transaction, the rationale * for this being that most entries will contain our own TransactionId and diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 8d0aabff10..fe33c87dbf 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -7595,7 +7595,7 @@ LogCheckpointEnd(bool restartpoint) * CHECKPOINT_END_OF_RECOVERY: checkpoint is for end of WAL recovery. * CHECKPOINT_IMMEDIATE: finish the checkpoint ASAP, * ignoring checkpoint_completion_target parameter. - * CHECKPOINT_FORCE: force a checkpoint even if no XLOG activity has occured + * CHECKPOINT_FORCE: force a checkpoint even if no XLOG activity has occurred * since the last one (implied by CHECKPOINT_IS_SHUTDOWN or * CHECKPOINT_END_OF_RECOVERY). * diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c index bcc663515c..a67aebbdb6 100644 --- a/src/backend/catalog/pg_shdepend.c +++ b/src/backend/catalog/pg_shdepend.c @@ -392,7 +392,7 @@ getOidListDiff(Oid *list1, int *nlist1, Oid *list2, int *nlist2) * nnewmembers, newmembers: array of roleids appearing in new ACL * * We calculate the differences between the new and old lists of roles, - * and then insert or delete from pg_shdepend as appropiate. + * and then insert or delete from pg_shdepend as appropriate. * * Note that we can't just insert all referenced roles blindly during GRANT, * because we would end up with duplicate registered dependencies. We could diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 95fec8d386..15f43fd3d6 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -1984,7 +1984,7 @@ CopyFrom(CopyState cstate) AfterTriggerBeginQuery(); /* - * Check BEFORE STATEMENT insertion triggers. It's debateable whether we + * Check BEFORE STATEMENT insertion triggers. It's debatable whether we * should do this for COPY, since it's not really an "INSERT" statement as * such. However, executing these triggers maintains consistency with the * EACH ROW triggers that we already fire on COPY. diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 3f0945b57d..c94d945722 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -6247,7 +6247,7 @@ ATExecValidateConstraint(Relation rel, char *constrName, bool recurse, heap_close(refrel, NoLock); /* - * Foreign keys do not inherit, so we purposedly ignore the + * Foreign keys do not inherit, so we purposely ignore the * recursion bit here */ } diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c index 701a986f43..140b3f851e 100644 --- a/src/backend/commands/typecmds.c +++ b/src/backend/commands/typecmds.c @@ -2754,7 +2754,7 @@ get_rels_with_domain(Oid domainOid, LOCKMODE lockmode) /* * Confirm column has not been dropped, and is of the expected type. - * This defends against an ALTER DROP COLUMN occuring just before we + * This defends against an ALTER DROP COLUMN occurring just before we * acquired lock ... but if the whole table were dropped, we'd still * have a problem. */ diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c index f921847db9..a1e55646c6 100644 --- a/src/backend/executor/nodeMergejoin.c +++ b/src/backend/executor/nodeMergejoin.c @@ -1361,7 +1361,7 @@ ExecMergeJoin(MergeJoinState *node) /* * EXEC_MJ_ENDOUTER means we have run out of outer tuples, but * are doing a right/full join and therefore must null-fill - * any remaing unmatched inner tuples. + * any remaining unmatched inner tuples. */ case EXEC_MJ_ENDOUTER: MJ_printf("ExecMergeJoin: EXEC_MJ_ENDOUTER\n"); @@ -1407,7 +1407,7 @@ ExecMergeJoin(MergeJoinState *node) /* * EXEC_MJ_ENDINNER means we have run out of inner tuples, but * are doing a left/full join and therefore must null- fill - * any remaing unmatched outer tuples. + * any remaining unmatched outer tuples. */ case EXEC_MJ_ENDINNER: MJ_printf("ExecMergeJoin: EXEC_MJ_ENDINNER\n"); diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index efbb640a45..187aea8f99 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -145,7 +145,7 @@ static int pg_krb5_recvauth(Port *port); #include <com_err.h> #endif /* - * Various krb5 state which is not connection specfic, and a flag to + * Various krb5 state which is not connection specific, and a flag to * indicate whether we have initialised it yet. */ static int pg_krb5_initialised; diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index a289d4bd14..154854f140 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -9631,7 +9631,7 @@ SimpleTypename: * makes no sense for constructs like CHAR 'hi' and BIT '0101', * where there is an obvious better choice to make. * Note that ConstInterval is not included here since it must - * be pushed up higher in the rules to accomodate the postfix + * be pushed up higher in the rules to accommodate the postfix * options (e.g. INTERVAL '1' YEAR). Likewise, we have to handle * the generic-type-name case in AExprConst to avoid premature * reduce/reduce conflicts against function names. diff --git a/src/backend/parser/parse_collate.c b/src/backend/parser/parse_collate.c index 9a722a7400..ba49f9fd59 100644 --- a/src/backend/parser/parse_collate.c +++ b/src/backend/parser/parse_collate.c @@ -49,7 +49,7 @@ /* * Collation strength (the SQL standard calls this "derivation"). Order is * chosen to allow comparisons to work usefully. Note: the standard doesn't - * seem to distingish between NONE and CONFLICT. + * seem to distinguish between NONE and CONFLICT. */ typedef enum { diff --git a/src/backend/port/win32/socket.c b/src/backend/port/win32/socket.c index 26c7b2ed23..b2c6325328 100644 --- a/src/backend/port/win32/socket.c +++ b/src/backend/port/win32/socket.c @@ -486,7 +486,7 @@ pgwin32_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, c /* * Not completed, and not just "would block", so an error - * occured + * occurred */ FD_SET(writefds->fd_array[i], &outwritefds); } diff --git a/src/backend/postmaster/checkpointer.c b/src/backend/postmaster/checkpointer.c index c9473f7bad..2329b1a9a9 100644 --- a/src/backend/postmaster/checkpointer.c +++ b/src/backend/postmaster/checkpointer.c @@ -888,7 +888,7 @@ BgWriterShmemInit(void) * CHECKPOINT_END_OF_RECOVERY: checkpoint is for end of WAL recovery. * CHECKPOINT_IMMEDIATE: finish the checkpoint ASAP, * ignoring checkpoint_completion_target parameter. - * CHECKPOINT_FORCE: force a checkpoint even if no XLOG activity has occured + * CHECKPOINT_FORCE: force a checkpoint even if no XLOG activity has occurred * since the last one (implied by CHECKPOINT_IS_SHUTDOWN or * CHECKPOINT_END_OF_RECOVERY). * CHECKPOINT_WAIT: wait for completion before returning (otherwise, diff --git a/src/backend/storage/file/reinit.c b/src/backend/storage/file/reinit.c index 94c6cef78a..1912dd8e7a 100644 --- a/src/backend/storage/file/reinit.c +++ b/src/backend/storage/file/reinit.c @@ -345,7 +345,7 @@ ResetUnloggedRelationsInDbspaceDir(const char *dbspacedirname, int op) /* * Basic parsing of putative relation filenames. * - * This funtion returns true if the file appears to be in the correct format + * This function returns true if the file appears to be in the correct format * for a non-temporary relation and false otherwise. * * NB: If this function returns true, the caller is entitled to assume that diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c index 09b7311e7b..1c9346a7eb 100644 --- a/src/backend/storage/ipc/procarray.c +++ b/src/backend/storage/ipc/procarray.c @@ -279,10 +279,10 @@ ProcArrayAdd(PGPROC *proc) /* * Keep the procs array sorted by (PGPROC *) so that we can utilize * locality of references much better. This is useful while traversing the - * ProcArray because there is a increased likelyhood of finding the next + * ProcArray because there is a increased likelihood of finding the next * PGPROC structure in the cache. * - * Since the occurance of adding/removing a proc is much lower than the + * Since the occurrence of adding/removing a proc is much lower than the * access to the ProcArray itself, the overhead should be marginal */ for (index = 0; index < arrayP->numProcs; index++) diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c index 1001ed2a17..6322a608cb 100644 --- a/src/backend/storage/lmgr/predicate.c +++ b/src/backend/storage/lmgr/predicate.c @@ -1234,7 +1234,7 @@ InitPredicateLocks(void) * that this will prevent resource exhaustion in even the most pessimal * loads up to max_connections = 200 with all 200 connections pounding the * database with serializable transactions. Beyond that, there may be - * occassional transactions canceled when trying to flag conflicts. That's + * occasional transactions canceled when trying to flag conflicts. That's * probably OK. */ max_table_size *= 5; diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c index 9644afc34a..a8bf2bfffb 100644 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@ -821,7 +821,7 @@ acldefault(GrantObjectType objtype, Oid ownerId) * owner's ordinary privileges are self-granted; this lets him revoke * them. We implement the owner's grant options without any explicit * "_SYSTEM"-like ACL entry, by internally special-casing the owner - * whereever we are testing grant options. + * wherever we are testing grant options. */ if (owner_default != ACL_NO_RIGHTS) { diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c index 8ff87d6a0e..d848739d4a 100644 --- a/src/backend/utils/adt/formatting.c +++ b/src/backend/utils/adt/formatting.c @@ -2186,7 +2186,7 @@ from_char_parse_int_len(int *dest, char **src, const int len, FormatNode *node) * Don't call this function if the field differs in length from the format * keyword (as with HH24; the keyword length is 4, but the field length is 2). * In such cases, call from_char_parse_int_len() instead to specify the - * required length explictly. + * required length explicitly. */ static int from_char_parse_int(int *dest, char **src, FormatNode *node) diff --git a/src/backend/utils/adt/tsquery_cleanup.c b/src/backend/utils/adt/tsquery_cleanup.c index 23493e9fbb..054b529845 100644 --- a/src/backend/utils/adt/tsquery_cleanup.c +++ b/src/backend/utils/adt/tsquery_cleanup.c @@ -124,7 +124,7 @@ freetree(NODE *node) /* * clean tree for ! operator. - * It's usefull for debug, but in + * It's useful for debug, but in * other case, such view is used with search in index. * Operator ! always return TRUE */ diff --git a/src/backend/utils/adt/tsrank.c b/src/backend/utils/adt/tsrank.c index 38e384c650..960233b633 100644 --- a/src/backend/utils/adt/tsrank.c +++ b/src/backend/utils/adt/tsrank.c @@ -603,7 +603,7 @@ Cover(DocRepresentation *doc, int len, QueryRepresentation *qr, Extention *ext) if (ext->p <= ext->q) { /* - * set position for next try to next lexeme after begining of founded + * set position for next try to next lexeme after beginning of found * cover */ ext->pos = (ptr - doc) + 1; diff --git a/src/backend/utils/mb/wchar.c b/src/backend/utils/mb/wchar.c index 10c46654e0..7de460e0dd 100644 --- a/src/backend/utils/mb/wchar.c +++ b/src/backend/utils/mb/wchar.c @@ -214,7 +214,7 @@ pg_euccn2wchar_with_len(const unsigned char *from, pg_wchar *to, int len) *to |= *from++; len -= 3; } - else if (*from == SS3 && len >= 3) /* code set 3 (unsed ?) */ + else if (*from == SS3 && len >= 3) /* code set 3 (unused ?) */ { from++; *to = (SS3 << 16) | (*from++ << 8); diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c index 9f15563017..6bd3451e4c 100644 --- a/src/bin/pg_config/pg_config.c +++ b/src/bin/pg_config/pg_config.c @@ -8,7 +8,7 @@ * * This is a C implementation of the previous shell script written by * Peter Eisentraut <peter_e@gmx.net>, with adjustments made to - * accomodate the possibility that the installation has been relocated from + * accommodate the possibility that the installation has been relocated from * the place originally configured. * * author of C translation: Andrew Dunstan mailto:andrew@dunslane.net diff --git a/src/bin/pg_dump/pg_backup_custom.c b/src/bin/pg_dump/pg_backup_custom.c index 18d158ff6d..2156d0f619 100644 --- a/src/bin/pg_dump/pg_backup_custom.c +++ b/src/bin/pg_dump/pg_backup_custom.c @@ -228,7 +228,7 @@ _WriteExtraToc(ArchiveHandle *AH, TocEntry *te) * * Optional. * - * Needs to match the order defined in _WriteExtraToc, and sould also + * Needs to match the order defined in _WriteExtraToc, and should also * use the Archiver input routines. */ static void diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 58fa92935b..d2229af846 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -12145,7 +12145,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo) PGresult *res; int numParents; TableInfo **parents; - int actual_atts; /* number of attrs in this CREATE statment */ + int actual_atts; /* number of attrs in this CREATE statement */ const char *reltypename; char *storage; char *srvname; diff --git a/src/bin/pgevent/pgmsgevent.h b/src/bin/pgevent/pgmsgevent.h index 8083131e12..aba71e407f 100644 --- a/src/bin/pgevent/pgmsgevent.h +++ b/src/bin/pgevent/pgmsgevent.h @@ -1,7 +1,7 @@ /* src/bin/pgevent/pgmsgevent.h */ /* */ -/* Values are 32 bit values layed out as follows: */ +/* Values are 32 bit values laid out as follows: */ /* */ /* 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 */ /* 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 */ diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index aa000735dc..dd59aa116c 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -2471,10 +2471,10 @@ do_shell(const char *command) sys = pg_malloc(strlen(shellName) + 16); #ifndef WIN32 sprintf(sys, - /* See EDITOR handling comment for an explaination */ + /* See EDITOR handling comment for an explanation */ "exec %s", shellName); #else - /* See EDITOR handling comment for an explaination */ + /* See EDITOR handling comment for an explanation */ sprintf(sys, SYSTEMQUOTE "\"%s\"" SYSTEMQUOTE, shellName); #endif result = system(sys); diff --git a/src/include/access/itup.h b/src/include/access/itup.h index ccefe6a201..2f04b871a4 100644 --- a/src/include/access/itup.h +++ b/src/include/access/itup.h @@ -37,7 +37,7 @@ typedef struct IndexTupleData ItemPointerData t_tid; /* reference TID to heap tuple */ /* --------------- - * t_info is layed out in the following fashion: + * t_info is laid out in the following fashion: * * 15th (high) bit: has nulls * 14th bit: has var-width attributes diff --git a/src/include/port/win32.h b/src/include/port/win32.h index e2dd23b284..287da98ecf 100644 --- a/src/include/port/win32.h +++ b/src/include/port/win32.h @@ -5,7 +5,7 @@ #endif /* - * Make sure _WIN32_WINNT has the minumum required value. + * Make sure _WIN32_WINNT has the minimum required value. * Leave a higher value in place. */ #if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0501 diff --git a/src/interfaces/ecpg/ecpglib/descriptor.c b/src/interfaces/ecpg/ecpglib/descriptor.c index 73c79703ca..b2990cab28 100644 --- a/src/interfaces/ecpg/ecpglib/descriptor.c +++ b/src/interfaces/ecpg/ecpglib/descriptor.c @@ -479,7 +479,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...) memset(&stmt, 0, sizeof stmt); stmt.lineno = lineno; - /* desparate try to guess something sensible */ + /* desperate try to guess something sensible */ stmt.connection = ecpg_get_connection(NULL); ecpg_store_result(ECPGresult, index, &stmt, &data_var); diff --git a/src/interfaces/ecpg/ecpglib/prepare.c b/src/interfaces/ecpg/ecpglib/prepare.c index 1bddf215af..e49ae3763c 100644 --- a/src/interfaces/ecpg/ecpglib/prepare.c +++ b/src/interfaces/ecpg/ecpglib/prepare.c @@ -124,7 +124,7 @@ prepare_common(int lineno, struct connection * con, const char *name, const char stmt->command = ecpg_strdup(variable, lineno); stmt->inlist = stmt->outlist = NULL; - /* if we have C variables in our statment replace them with '?' */ + /* if we have C variables in our statement replace them with '?' */ replace_variables(&(stmt->command), lineno); /* add prepared statement to our list */ @@ -463,7 +463,7 @@ AddStmtToCache(int lineno, /* line # of statement */ return (entNo); } -/* handle cache and preparation of statments in auto-prepare mode */ +/* handle cache and preparation of statements in auto-prepare mode */ bool ecpg_auto_prepare(int lineno, const char *connection_name, const int compat, char **name, const char *query) { diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c index ff53340079..6b89e4a67e 100644 --- a/src/interfaces/ecpg/pgtypeslib/dt_common.c +++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c @@ -310,7 +310,7 @@ static datetkn datetktbl[] = { #if 0 phst #endif - {"pht", TZ, POS(32)}, /* Phillipine Time */ + {"pht", TZ, POS(32)}, /* Philippine Time */ {"pkt", TZ, POS(20)}, /* Pakistan Time */ {"pm", AMPM, PM}, {"pmdt", DTZ, NEG(8)}, /* Pierre & Miquelon Daylight Time */ @@ -2342,7 +2342,7 @@ DecodeDateTime(char **field, int *ftype, int nf, */ tmask = 0; - /* No preceeding date? Then quit... */ + /* No preceding date? Then quit... */ if ((fmask & DTK_DATE_M) != DTK_DATE_M) return -1; diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c index 1eaf715c47..36f101bb1c 100644 --- a/src/interfaces/ecpg/pgtypeslib/timestamp.c +++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c @@ -342,7 +342,7 @@ PGTYPEStimestamp_from_asc(char *str, char **endptr) /* * Since it's difficult to test for noresult, make sure errno is 0 if no - * error occured. + * error occurred. */ errno = 0; return result; diff --git a/src/interfaces/ecpg/preproc/ecpg.trailer b/src/interfaces/ecpg/preproc/ecpg.trailer index 35bbe5414e..8258ce2f7d 100644 --- a/src/interfaces/ecpg/preproc/ecpg.trailer +++ b/src/interfaces/ecpg/preproc/ecpg.trailer @@ -1104,7 +1104,7 @@ opt_output: SQL_OUTPUT { $$ = mm_strdup("output"); } /* * dynamic SQL: descriptor based access - * originall written by Christof Petig <christof.petig@wtal.de> + * originally written by Christof Petig <christof.petig@wtal.de> * and Peter Eisentraut <peter.eisentraut@credativ.de> */ diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l index 92ea37e6f6..4d31f3bbe4 100644 --- a/src/interfaces/ecpg/preproc/pgc.l +++ b/src/interfaces/ecpg/preproc/pgc.l @@ -344,7 +344,7 @@ cppinclude_next {space}*#{include_next}{space}* /* take care of cpp lines, they may also be continuated */ /* first a general line for all commands not starting with "i" */ /* and then the other commands starting with "i", we have to add these - * seperately because the cppline production would match on "include" too */ + * separately because the cppline production would match on "include" too */ cppline {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})(.*\\{space})*.*{newline} /* diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c index 86f157c338..c643b8e69c 100644 --- a/src/interfaces/libpq/fe-exec.c +++ b/src/interfaces/libpq/fe-exec.c @@ -218,7 +218,7 @@ PQmakeEmptyPGresult(PGconn *conn, ExecStatusType status) * * Set the attributes for a given result. This function fails if there are * already attributes contained in the provided result. The call is - * ignored if numAttributes is is zero or attDescs is NULL. If the + * ignored if numAttributes is zero or attDescs is NULL. If the * function fails, it returns zero. If the function succeeds, it * returns a non-zero value. */ diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c index 6695492c7f..94ef40d3bc 100644 --- a/src/interfaces/libpq/fe-print.c +++ b/src/interfaces/libpq/fe-print.c @@ -57,7 +57,7 @@ static void fill(int length, int max, char filler, FILE *fp); * * Format results of a query for printing. * - * PQprintOpt is a typedef (structure) that containes + * PQprintOpt is a typedef (structure) that contains * various flags and options. consult libpq-fe.h for * details * diff --git a/src/interfaces/libpq/win32.c b/src/interfaces/libpq/win32.c index 2e79818b5c..92e1c9ba98 100644 --- a/src/interfaces/libpq/win32.c +++ b/src/interfaces/libpq/win32.c @@ -277,7 +277,7 @@ struct MessageDLL * to find it in the lookup table, and if that fails, tries * to load any of the winsock dlls to find that message. * The DLL thing works from Nt4 (spX ?) up, but some special - * versions of winsock might have this aswell (seen on Win98 SE + * versions of winsock might have this as well (seen on Win98 SE * special install) / Magnus Naeslund (mag@fbab.net) * */ diff --git a/src/nls-global.mk b/src/nls-global.mk index bb2c8328b4..e6c4a633a4 100644 --- a/src/nls-global.mk +++ b/src/nls-global.mk @@ -92,7 +92,7 @@ endif # GETTEXT_FILES rm messages.po -# catalog name extentions must match behavior of PG_TEXTDOMAIN() in c.h +# catalog name extensions must match behavior of PG_TEXTDOMAIN() in c.h install-po: all-po installdirs-po ifneq (,$(LANGUAGES)) for lang in $(LANGUAGES); do \ diff --git a/src/pl/tcl/expected/pltcl_setup.out b/src/pl/tcl/expected/pltcl_setup.out index a1385b2eee..3f36a80525 100644 --- a/src/pl/tcl/expected/pltcl_setup.out +++ b/src/pl/tcl/expected/pltcl_setup.out @@ -31,7 +31,7 @@ create table T_dta2 ( ref2 char(20) ); -- --- Function to check key existance in T_pkey1 +-- Function to check key existence in T_pkey1 -- create function check_pkey1_exists(int4, bpchar) returns bool as E' if {![info exists GD]} { diff --git a/src/pl/tcl/sql/pltcl_setup.sql b/src/pl/tcl/sql/pltcl_setup.sql index 2176d5c4f4..df7f9fadd1 100644 --- a/src/pl/tcl/sql/pltcl_setup.sql +++ b/src/pl/tcl/sql/pltcl_setup.sql @@ -36,7 +36,7 @@ create table T_dta2 ( -- --- Function to check key existance in T_pkey1 +-- Function to check key existence in T_pkey1 -- create function check_pkey1_exists(int4, bpchar) returns bool as E' if {![info exists GD]} { diff --git a/src/test/mb/README b/src/test/mb/README index f3de449445..632e8c35bb 100644 --- a/src/test/mb/README +++ b/src/test/mb/README @@ -5,6 +5,6 @@ README for multibyte regression test Tatsuo Ishii This directory contains a set of tests for multibyte supporting -extentions for PostgreSQL. To run the test, simply type: +extensions for PostgreSQL. To run the test, simply type: % sh mbregress.sh diff --git a/src/test/regress/expected/foreign_key.out b/src/test/regress/expected/foreign_key.out index 65dfe024a9..cddcda79b6 100644 --- a/src/test/regress/expected/foreign_key.out +++ b/src/test/regress/expected/foreign_key.out @@ -865,7 +865,7 @@ create table fktable (ftest1 int references pktable(base1)); -- now some ins, upd, del insert into pktable(base1) values (1); insert into pktable(base1) values (2); --- let's insert a non-existant fktable value +-- let's insert a non-existent fktable value insert into fktable(ftest1) values (3); ERROR: insert or update on table "fktable" violates foreign key constraint "fktable_ftest1_fkey" DETAIL: Key (ftest1)=(3) is not present in table "pktable". @@ -893,7 +893,7 @@ create table fktable (ftest1 int, ftest2 int, foreign key(ftest1, ftest2) refere -- now some ins, upd, del insert into pktable(base1, ptest1) values (1, 1); insert into pktable(base1, ptest1) values (2, 2); --- let's insert a non-existant fktable value +-- let's insert a non-existent fktable value insert into fktable(ftest1, ftest2) values (3, 1); ERROR: insert or update on table "fktable" violates foreign key constraint "fktable_ftest1_fkey" DETAIL: Key (ftest1, ftest2)=(3, 1) is not present in table "pktable". diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index 90c342b7a8..2931a73fdb 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -381,7 +381,7 @@ string_matches_pattern(const char *str, const char *pattern) } /* - * Replace all occurances of a string in a string with a different string. + * Replace all occurrences of a string in a string with a different string. * NOTE: Assumes there is enough room in the target buffer! */ void diff --git a/src/test/regress/sql/foreign_key.sql b/src/test/regress/sql/foreign_key.sql index 6bd9ddd1a5..fe9bfde101 100644 --- a/src/test/regress/sql/foreign_key.sql +++ b/src/test/regress/sql/foreign_key.sql @@ -525,7 +525,7 @@ create table fktable (ftest1 int references pktable(base1)); -- now some ins, upd, del insert into pktable(base1) values (1); insert into pktable(base1) values (2); --- let's insert a non-existant fktable value +-- let's insert a non-existent fktable value insert into fktable(ftest1) values (3); -- let's make a valid row for that insert into pktable(base1) values (3); @@ -548,7 +548,7 @@ create table fktable (ftest1 int, ftest2 int, foreign key(ftest1, ftest2) refere -- now some ins, upd, del insert into pktable(base1, ptest1) values (1, 1); insert into pktable(base1, ptest1) values (2, 2); --- let's insert a non-existant fktable value +-- let's insert a non-existent fktable value insert into fktable(ftest1, ftest2) values (3, 1); -- let's make a valid row for that insert into pktable(base1,ptest1) values (3, 1); diff --git a/src/timezone/tznames/Asia.txt b/src/timezone/tznames/Asia.txt index 1c6f276d0f..4b16e084ab 100644 --- a/src/timezone/tznames/Asia.txt +++ b/src/timezone/tznames/Asia.txt @@ -200,7 +200,7 @@ PETST 46800 D # Petropavlovsk-Kamchatski Summer Time # (Asia/Kamchatka) PETT 43200 # Petropavlovsk-Kamchatski Time # (Asia/Kamchatka) -PHT 28800 # Phillipine Time (not in zic) +PHT 28800 # Philippine Time (not in zic) PKT 18000 # Pakistan Time # (Asia/Karachi) PKST 21600 D # Pakistan Summer Time diff --git a/src/timezone/tznames/Default b/src/timezone/tznames/Default index 7a7a87e651..1369f47bfb 100644 --- a/src/timezone/tznames/Default +++ b/src/timezone/tznames/Default @@ -333,7 +333,7 @@ PETST 46800 D # Petropavlovsk-Kamchatski Summer Time # (Asia/Kamchatka) PETT 43200 # Petropavlovsk-Kamchatski Time # (Asia/Kamchatka) -PHT 28800 # Phillipine Time (not in zic) +PHT 28800 # Philippine Time (not in zic) PKT 18000 # Pakistan Time # (Asia/Karachi) PKST 21600 D # Pakistan Summer Time diff --git a/src/tools/backend/index.html b/src/tools/backend/index.html index 19945f8661..eb4978bfe0 100644 --- a/src/tools/backend/index.html +++ b/src/tools/backend/index.html @@ -111,7 +111,7 @@ flowchart.</p> <hr /> <p>Another area of interest is the shared memory area, which -contains data accessable to all backends. It has recently used +contains data accessible to all backends. It has recently used data/index blocks, locks, backend process information, and lookup tables for these structures:</p> diff --git a/src/tools/msvc/README b/src/tools/msvc/README index ad0eca3672..bbadb34829 100644 --- a/src/tools/msvc/README +++ b/src/tools/msvc/README @@ -86,7 +86,7 @@ Description of the internals of the Visual Studio build process By typing 'build' the user starts the build.bat wrapper which simply passes it's arguments to build.pl. In build.pl the user's buildenv.pl is used to set up the build environment -(i. e. path to bison and flex). In addtion his config.pl file is merged into +(i. e. path to bison and flex). In addition his config.pl file is merged into config_default.pl to create the configuration arguments. These configuration arguments are passed over to Mkvcbuild::mkvcbuild (Mkvcbuild.pm) which creates the Visual Studio project and solution files. diff --git a/src/tools/msvc/VSObjectFactory.pm b/src/tools/msvc/VSObjectFactory.pm index 44db1f6814..3bed922991 100644 --- a/src/tools/msvc/VSObjectFactory.pm +++ b/src/tools/msvc/VSObjectFactory.pm @@ -81,7 +81,7 @@ sub DetermineVisualStudioVersion if (!defined($nmakeVersion)) { - # Determine version of nmake command, to set proper verison of visual studio + # Determine version of nmake command, to set proper version of visual studio # we use nmake as it has existed for a long time and still exists in visual studio 2010 open(P,"nmake /? 2>&1 |") || croak "Unable to determine Visual Studio version: The nmake command wasn't found."; diff --git a/src/tools/pginclude/pgcompinclude b/src/tools/pginclude/pgcompinclude index 5625f34343..12169db9f6 100755 --- a/src/tools/pginclude/pgcompinclude +++ b/src/tools/pginclude/pgcompinclude @@ -17,7 +17,7 @@ do sed 's/->[a-zA-Z0-9_\.]*//g' "$FILE" >/tmp/$$a echo "#include \"postgres.h\"" >/tmp/$$.c - # supress fcinfo errors + # suppress fcinfo errors echo "struct {Datum arg[1];} *fcinfo;" >>/tmp/$$.c echo "#include \"/tmp/$$a\"" >>/tmp/$$.c diff --git a/src/tools/pginclude/pgrminclude b/src/tools/pginclude/pgrminclude index 75a7c6d5c7..383c5044bd 100755 --- a/src/tools/pginclude/pgrminclude +++ b/src/tools/pginclude/pgrminclude @@ -90,7 +90,7 @@ compile_file() { if [ "$IS_INCLUDE" = "Y" ] then echo "#include \"postgres.h\"" >/tmp/$$.c - # supress fcinfo errors + # suppress fcinfo errors echo "struct {Datum arg[1];} *fcinfo;" >>/tmp/$$.c else >/tmp/$$.c fi |