From 4ad6f13500cd9a3ca0652e43232f9515319e55e2 Mon Sep 17 00:00:00 2001
From: Noah Misch <noah@leadboat.com>
Date: Fri, 1 Apr 2016 21:53:10 -0400
Subject: [PATCH] Copyedit comments and documentation.
---
config/c-compiler.m4 | 2 +-
contrib/pgstattuple/pgstatapprox.c | 2 +-
doc/src/sgml/install-windows.sgml | 2 +-
doc/src/sgml/release-9.3.sgml | 2 +-
doc/src/sgml/xml2.sgml | 2 +-
src/backend/executor/execParallel.c | 2 +-
src/backend/storage/buffer/README | 12 ++++++------
src/backend/storage/buffer/bufmgr.c | 4 ++--
src/backend/storage/freespace/freespace.c | 4 ++--
src/backend/storage/ipc/procarray.c | 2 +-
src/backend/storage/lmgr/predicate.c | 4 ++--
src/backend/storage/smgr/md.c | 2 +-
src/backend/utils/adt/timestamp.c | 2 +-
src/backend/utils/hash/dynahash.c | 2 +-
src/pl/plperl/plperl.c | 2 +-
src/test/perl/TestLib.pm | 2 +-
src/tools/valgrind.supp | 2 +-
17 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/config/c-compiler.m4 b/config/c-compiler.m4
index 550d03474c6..a7f6773ae13 100644
--- a/config/c-compiler.m4
+++ b/config/c-compiler.m4
@@ -335,7 +335,7 @@ if test x"$Ac_cachevar" = x"yes"; then
$1="${$1} $2"
fi
undefine([Ac_cachevar])dnl
-])# PGAC_PROG_CC_CFLAGS_OPT
+])# PGAC_PROG_CC_VAR_OPT
diff --git a/contrib/pgstattuple/pgstatapprox.c b/contrib/pgstattuple/pgstatapprox.c
index 5d08c7377c5..a49ff543d2d 100644
--- a/contrib/pgstattuple/pgstatapprox.c
+++ b/contrib/pgstattuple/pgstatapprox.c
@@ -1,6 +1,6 @@
/*-------------------------------------------------------------------------
*
- * pgstatapproc.c
+ * pgstatapprox.c
* Bloat estimation functions
*
* Copyright (c) 2014-2016, PostgreSQL Global Development Group
diff --git a/doc/src/sgml/install-windows.sgml b/doc/src/sgml/install-windows.sgml
index f08cca7fce5..9360383c4ca 100644
--- a/doc/src/sgml/install-windows.sgml
+++ b/doc/src/sgml/install-windows.sgml
@@ -457,7 +457,7 @@ $ENV{CONFIG}="Debug";
<para>
Running the regression tests on client programs, with
<command>vcregress bincheck</>, or on recovery tests, with
- <command>vcregress recoverycheck</> requires an additional Perl module
+ <command>vcregress recoverycheck</>, requires an additional Perl module
to be installed:
<variablelist>
<varlistentry>
diff --git a/doc/src/sgml/release-9.3.sgml b/doc/src/sgml/release-9.3.sgml
index 9cb59b0cb34..095083a41e7 100644
--- a/doc/src/sgml/release-9.3.sgml
+++ b/doc/src/sgml/release-9.3.sgml
@@ -9689,7 +9689,7 @@ ALTER EXTENSION hstore UPDATE;
<listitem>
<para>
- Remove <filename>src/tool/backend</>, now that the content is on
+ Remove <filename>src/tools/backend</>, now that the content is on
the <productname>PostgreSQL</> wiki (Bruce Momjian)
</para>
</listitem>
diff --git a/doc/src/sgml/xml2.sgml b/doc/src/sgml/xml2.sgml
index c4b85bfee6c..a40172c36d2 100644
--- a/doc/src/sgml/xml2.sgml
+++ b/doc/src/sgml/xml2.sgml
@@ -324,7 +324,7 @@ AS t(article_id integer, author text, page_count integer, title text);
</para>
<para>
- The calling <command>SELECT</> statement doesn't necessarily have be
+ The calling <command>SELECT</> statement doesn't necessarily have to be
just <literal>SELECT *</> — it can reference the output
columns by name or join them to other tables. The function produces a
virtual table with which you can perform any operation you wish (e.g.
diff --git a/src/backend/executor/execParallel.c b/src/backend/executor/execParallel.c
index 93c786abdbe..572a77bb3a0 100644
--- a/src/backend/executor/execParallel.c
+++ b/src/backend/executor/execParallel.c
@@ -71,7 +71,7 @@ typedef struct ExecParallelEstimateContext
int nnodes;
} ExecParallelEstimateContext;
-/* Context object for ExecParallelEstimate. */
+/* Context object for ExecParallelInitializeDSM. */
typedef struct ExecParallelInitializeDSMContext
{
ParallelContext *pcxt;
diff --git a/src/backend/storage/buffer/README b/src/backend/storage/buffer/README
index dc12c8ca087..248883f0dae 100644
--- a/src/backend/storage/buffer/README
+++ b/src/backend/storage/buffer/README
@@ -89,12 +89,12 @@ then returns false, while LockBufferForCleanup() releases the exclusive lock
(but not the caller's pin) and waits until signaled by another backend,
whereupon it tries again. The signal will occur when UnpinBuffer decrements
the shared pin count to 1. As indicated above, this operation might have to
-wait a good while before it acquires lock, but that shouldn't matter much for
-concurrent VACUUM. The current implementation only supports a single waiter
-for pin-count-1 on any particular shared buffer. This is enough for VACUUM's
-use, since we don't allow multiple VACUUMs concurrently on a single relation
-anyway. Anyone wishing to obtain a cleanup lock outside of recovery or a
-VACUUM must use the conditional variant of the function.
+wait a good while before it acquires the lock, but that shouldn't matter much
+for concurrent VACUUM. The current implementation only supports a single
+waiter for pin-count-1 on any particular shared buffer. This is enough for
+VACUUM's use, since we don't allow multiple VACUUMs concurrently on a single
+relation anyway. Anyone wishing to obtain a cleanup lock outside of recovery
+or a VACUUM must use the conditional variant of the function.
Buffer Manager's Internal Locking
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 6dd7c6ecb67..42aa2f9df9b 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -921,7 +921,7 @@ ReadBuffer_common(SMgrRelation smgr, char relpersistence, ForkNumber forkNum,
*
* Since no-one else can be looking at the page contents yet, there is no
* difference between an exclusive lock and a cleanup-strength lock. (Note
- * that we cannot use LockBuffer() of LockBufferForCleanup() here, because
+ * that we cannot use LockBuffer() or LockBufferForCleanup() here, because
* they assert that the buffer is already valid.)
*/
if ((mode == RBM_ZERO_AND_LOCK || mode == RBM_ZERO_AND_CLEANUP_LOCK) &&
@@ -1882,7 +1882,7 @@ BufferSync(int flags)
* and clears the flag right after we check, but that doesn't matter
* since SyncOneBuffer will then do nothing. However, there is a
* further race condition: it's conceivable that between the time we
- * examine the bit here and the time SyncOneBuffer acquires lock,
+ * examine the bit here and the time SyncOneBuffer acquires the lock,
* someone else not only wrote the buffer but replaced it with another
* page and dirtied it. In that improbable case, SyncOneBuffer will
* write the buffer though we didn't need to. It doesn't seem worth
diff --git a/src/backend/storage/freespace/freespace.c b/src/backend/storage/freespace/freespace.c
index 2631080e58c..813990ea707 100644
--- a/src/backend/storage/freespace/freespace.c
+++ b/src/backend/storage/freespace/freespace.c
@@ -393,7 +393,7 @@ fsm_space_needed_to_cat(Size needed)
}
/*
- * Returns the physical block number an FSM page
+ * Returns the physical block number of a FSM page
*/
static BlockNumber
fsm_logical_to_physical(FSMAddress addr)
@@ -472,7 +472,7 @@ fsm_get_parent(FSMAddress child, uint16 *slot)
}
/*
- * Given a logical address of a parent page, and a slot number get the
+ * Given a logical address of a parent page and a slot number, get the
* logical address of the corresponding child page.
*/
static FSMAddress
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
index 740beb691ce..01cfa9d5f90 100644
--- a/src/backend/storage/ipc/procarray.c
+++ b/src/backend/storage/ipc/procarray.c
@@ -2673,7 +2673,7 @@ MinimumActiveBackends(int min)
/*
* Since we're not holding a lock, need to be prepared to deal with
- * garbage, as someone could have incremented numPucs but not yet
+ * garbage, as someone could have incremented numProcs but not yet
* filled the structure.
*
* If someone just decremented numProcs, 'proc' could also point to a
diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c
index 026d2b9ab7a..7cdb35541bf 100644
--- a/src/backend/storage/lmgr/predicate.c
+++ b/src/backend/storage/lmgr/predicate.c
@@ -496,8 +496,8 @@ SerializationNeededForRead(Relation relation, Snapshot snapshot)
* Don't acquire locks or conflict when scanning with a special snapshot.
* This excludes things like CLUSTER and REINDEX. They use the wholesale
* functions TransferPredicateLocksToHeapRelation() and
- * CheckTableForSerializableConflictIn() to participate serialization, but
- * the scans involved don't need serialization.
+ * CheckTableForSerializableConflictIn() to participate in serialization,
+ * but the scans involved don't need serialization.
*/
if (!IsMVCCSnapshot(snapshot))
return false;
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 764cfb53946..849b4a122b0 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -901,7 +901,7 @@ mdnblocks(SMgrRelation reln, ForkNumber forknum)
* We used to pass O_CREAT here, but that's has the disadvantage
* that it might create a segment which has vanished through some
* operating system misadventure. In such a case, creating the
- * segment here undermine _mdfd_getseg's attempts to notice and
+ * segment here undermines _mdfd_getseg's attempts to notice and
* report an error upon access to a missing segment.
*/
v->mdfd_chain = _mdfd_openseg(reln, forknum, segno, 0);
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index 7456808a427..98a2ab5e58a 100644
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -5148,7 +5148,7 @@ timestamp_zone_transform(PG_FUNCTION_ARGS)
* This function is just timestamp2timestamptz() except instead of
* shifting to the global timezone, we shift to the specified timezone.
* This is different from the other AT TIME ZONE cases because instead
- * of shifting to a _to_ a new time zone, it sets the time to _be_ the
+ * of shifting _to_ a new time zone, it sets the time to _be_ the
* specified timezone.
*/
Datum
diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
index 679ca775c6c..1a9f70c5662 100644
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@ -67,7 +67,7 @@
* are not implemented; otherwise functionality is identical.
*
* Compilation controls:
- * DEBUG controls some informative traces, mainly for debugging.
+ * HASH_DEBUG controls some informative traces, mainly for debugging.
* HASH_STATISTICS causes HashAccesses and HashCollisions to be maintained;
* when combined with HASH_DEBUG, these are displayed by hdestroy().
*
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index f60c227dda2..82bde6e4424 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -3977,7 +3977,7 @@ plperl_inline_callback(void *arg)
/*
- * Perl's own setlocal() copied from POSIX.xs
+ * Perl's own setlocale(), copied from POSIX.xs
* (needed because of the calls to new_*())
*/
#ifdef WIN32
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
index f1b5f8af8a0..0057f6dfe9f 100644
--- a/src/test/perl/TestLib.pm
+++ b/src/test/perl/TestLib.pm
@@ -1,7 +1,7 @@
# TestLib, low-level routines and actions regression tests.
#
# This module contains a set of routines dedicated to environment setup for
-# a PostgreSQL regression test tun, and includes some low-level routines
+# a PostgreSQL regression test run and includes some low-level routines
# aimed at controlling command execution, logging and test functions. This
# module should never depend on any other PostgreSQL regression test modules.
diff --git a/src/tools/valgrind.supp b/src/tools/valgrind.supp
index f0436789275..af03051260b 100644
--- a/src/tools/valgrind.supp
+++ b/src/tools/valgrind.supp
@@ -136,7 +136,7 @@
# Atomic writes to 64bit atomic vars uses compare/exchange to
# guarantee atomic writes of 64bit variables. pg_atomic_write is used
-# during initialization of the atomic variable, hat leads to an
+# during initialization of the atomic variable; that leads to an
# initial read of the old, undefined, memory value. But that's just to
# make sure the swap works correctly.
{
--
GitLab