Skip to content

Commit 648aa67

Browse files
peterepetere
committed
doc: Properly punctuate "etc."
1 parent c4a4e76 commit 648aa67

19 files changed

+32
-32
lines changed

‎doc/src/sgml/arch-dev.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@
261261
system catalog lookups can only be done within a transaction, and we
262262
do not wish to start a transaction immediately upon receiving a query
263263
string. The raw parsing stage is sufficient to identify the transaction
264-
control commands (<command>BEGIN</command>, <command>ROLLBACK</command>, etc), and
264+
control commands (<command>BEGIN</command>, <command>ROLLBACK</command>, etc.), and
265265
these can then be correctly executed without any further analysis.
266266
Once we know that we are dealing with an actual query (such as
267267
<command>SELECT</command> or <command>UPDATE</command>), it is okay to

‎doc/src/sgml/bki.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -836,11 +836,11 @@ $ perl rewrite_dat_with_prokind.pl pg_proc.dat
836836
When <literal>bootstrap</literal> is specified,
837837
the table will only be created on disk; nothing is entered into
838838
<structname>pg_class</structname>,
839-
<structname>pg_attribute</structname>, etc, for it. Thus the
839+
<structname>pg_attribute</structname>, etc., for it. Thus the
840840
table will not be accessible by ordinary SQL operations until
841841
such entries are made the hard way (with <literal>insert</literal>
842842
commands). This option is used for creating
843-
<structname>pg_class</structname> etc themselves.
843+
<structname>pg_class</structname> etc. themselves.
844844
</para>
845845

846846
<para>

‎doc/src/sgml/config.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6374,7 +6374,7 @@ local0.* /var/log/postgresql
63746374
<para>
63756375
Example: To keep 7 days of logs, one log file per day named
63766376
<literal>server_log.Mon</literal>, <literal>server_log.Tue</literal>,
6377-
etc, and automatically overwrite last week's log with this week's log,
6377+
etc., and automatically overwrite last week's log with this week's log,
63786378
set <varname>log_filename</varname> to <literal>server_log.%a</literal>,
63796379
<varname>log_truncate_on_rotation</varname> to <literal>on</literal>, and
63806380
<varname>log_rotation_age</varname> to <literal>1440</literal>.
@@ -8552,7 +8552,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
85528552
alias <literal>pg_temp</literal><indexterm><primary>pg_temp</primary></indexterm>. If it is not listed in the path then
85538553
it is searched first (even before <literal>pg_catalog</literal>). However,
85548554
the temporary schema is only searched for relation (table, view,
8555-
sequence, etc) and data type names. It is never searched for
8555+
sequence, etc.) and data type names. It is never searched for
85568556
function or operator names.
85578557
</para>
85588558

‎doc/src/sgml/datetime.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@
515515

516516
<para>
517517
For reference purposes, a standard installation also contains files
518-
<filename>Africa.txt</filename>, <filename>America.txt</filename>, etc, containing
518+
<filename>Africa.txt</filename>, <filename>America.txt</filename>, etc., containing
519519
information about every time zone abbreviation known to be in use
520520
according to the IANA timezone database. The zone name
521521
definitions found in these files can be copied and pasted into a custom

‎doc/src/sgml/ddl.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1694,7 +1694,7 @@ ALTER TABLE products RENAME TO items;
16941694
<literal>EXECUTE</literal>, <literal>USAGE</literal>, <literal>SET</literal>
16951695
and <literal>ALTER SYSTEM</literal>.
16961696
The privileges applicable to a particular
1697-
object vary depending on the object's type (table, function, etc).
1697+
object vary depending on the object's type (table, function, etc.).
16981698
More detail about the meanings of these privileges appears below.
16991699
The following sections and chapters will also show you how
17001700
these privileges are used.

‎doc/src/sgml/extend.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,7 @@ RETURNS anycompatible AS ...
825825
<para>
826826
An extension's <acronym>SQL</acronym> script files can contain any SQL commands,
827827
except for transaction control commands (<command>BEGIN</command>,
828-
<command>COMMIT</command>, etc) and commands that cannot be executed inside a
828+
<command>COMMIT</command>, etc.) and commands that cannot be executed inside a
829829
transaction block (such as <command>VACUUM</command>). This is because the
830830
script files are implicitly executed within a transaction block.
831831
</para>

‎doc/src/sgml/func.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6156,7 +6156,7 @@ regexp_substr('ABCDEFGHI', '(c..)(...)', 1, 1, 'i', 2)
61566156
<para>
61576157
A branch is zero or more <firstterm>quantified atoms</firstterm> or
61586158
<firstterm>constraints</firstterm>, concatenated.
6159-
It matches a match for the first, followed by a match for the second, etc;
6159+
It matches a match for the first, followed by a match for the second, etc.;
61606160
an empty branch matches the empty string.
61616161
</para>
61626162

‎doc/src/sgml/glossary.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1389,7 +1389,7 @@
13891389
<para>
13901390
More generically, the term <firstterm>schema</firstterm> is used to mean
13911391
all data descriptions (<glossterm linkend="glossary-table">table</glossterm> definitions,
1392-
<glossterm linkend="glossary-constraint">constraints</glossterm>, comments, etc)
1392+
<glossterm linkend="glossary-constraint">constraints</glossterm>, comments, etc.)
13931393
for a given <glossterm linkend="glossary-database">database</glossterm> or
13941394
subset thereof.
13951395
</para>

‎doc/src/sgml/libpq.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3049,7 +3049,7 @@ PGresult *PQdescribePrepared(PGconn *conn, const char *stmtName);
30493049
<structname>PGresult</structname> to obtain information about the parameters
30503050
of the prepared statement, and the functions
30513051
<xref linkend="libpq-PQnfields"/>, <xref linkend="libpq-PQfname"/>,
3052-
<xref linkend="libpq-PQftype"/>, etc provide information about the
3052+
<xref linkend="libpq-PQftype"/>, etc. provide information about the
30533053
result columns (if any) of the statement.
30543054
</para>
30553055
</listitem>
@@ -3081,7 +3081,7 @@ PGresult *PQdescribePortal(PGconn *conn, const char *portalName);
30813081
portal. On success, a <structname>PGresult</structname> with status
30823082
<literal>PGRES_COMMAND_OK</literal> is returned. The functions
30833083
<xref linkend="libpq-PQnfields"/>, <xref linkend="libpq-PQfname"/>,
3084-
<xref linkend="libpq-PQftype"/>, etc can be applied to the
3084+
<xref linkend="libpq-PQftype"/>, etc. can be applied to the
30853085
<structname>PGresult</structname> to obtain information about the result
30863086
columns (if any) of the portal.
30873087
</para>
@@ -5544,7 +5544,7 @@ UPDATE mytable SET x = x + 1 WHERE id = 42;
55445544
more rows will arrive. (But note that it is still necessary to continue
55455545
calling <xref linkend="libpq-PQgetResult"/> until it returns null.) All of
55465546
these <structname>PGresult</structname> objects will contain the same row
5547-
description data (column names, types, etc) that an ordinary
5547+
description data (column names, types, etc.) that an ordinary
55485548
<structname>PGresult</structname> object for the query would have.
55495549
Each object should be freed with <xref linkend="libpq-PQclear"/> as usual.
55505550
</para>
@@ -6010,7 +6010,7 @@ typedef struct pgNotify
60106010
<listitem>
60116011
<para>
60126012
0 indicates the overall copy format is textual (rows separated by
6013-
newlines, columns separated by separator characters, etc). 1
6013+
newlines, columns separated by separator characters, etc.). 1
60146014
indicates the overall copy format is binary. See <xref
60156015
linkend="sql-copy"/> for more information.
60166016
</para>

‎doc/src/sgml/manage-ag.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ dropdb <replaceable class="parameter">dbname</replaceable>
412412
of data files. They are dependent on metadata contained in the main
413413
data directory, and therefore cannot be attached to a different
414414
database cluster or backed up individually. Similarly, if you lose
415-
a tablespace (file deletion, disk failure, etc), the database cluster
415+
a tablespace (file deletion, disk failure, etc.), the database cluster
416416
might become unreadable or unable to start. Placing a tablespace
417417
on a temporary file system like a RAM disk risks the reliability of
418418
the entire cluster.

‎doc/src/sgml/plperl.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ SELECT * from lotsa_md5(500);
632632
<para>
633633
<literal>spi_prepare</literal>, <literal>spi_query_prepared</literal>, <literal>spi_exec_prepared</literal>,
634634
and <literal>spi_freeplan</literal> implement the same functionality but for prepared queries.
635-
<literal>spi_prepare</literal> accepts a query string with numbered argument placeholders ($1, $2, etc)
635+
<literal>spi_prepare</literal> accepts a query string with numbered argument placeholders ($1, $2, etc.)
636636
and a string list of argument types:
637637
<programlisting>
638638
$plan = spi_prepare('SELECT * FROM test WHERE id &gt; $1 AND name = $2',
@@ -677,7 +677,7 @@ SELECT done();
677677
2005-12-10 | 2005-12-11 | 2005-12-12
678678
</programlisting>
679679
Note that the parameter subscript in <literal>spi_prepare</literal> is defined via
680-
$1, $2, $3, etc, so avoid declaring query strings in double quotes that might easily
680+
$1, $2, $3, etc., so avoid declaring query strings in double quotes that might easily
681681
lead to hard-to-catch bugs.
682682
</para>
683683

@@ -1051,7 +1051,7 @@ $$ LANGUAGE plperl;
10511051
PL/Perl functions will share the same value of <varname>%_SHARED</varname>
10521052
if and only if they are executed by the same SQL role. In an application
10531053
wherein a single session executes code under multiple SQL roles (via
1054-
<literal>SECURITY DEFINER</literal> functions, use of <command>SET ROLE</command>, etc)
1054+
<literal>SECURITY DEFINER</literal> functions, use of <command>SET ROLE</command>, etc.)
10551055
you may need to take explicit steps to ensure that PL/Perl functions can
10561056
share data via <varname>%_SHARED</varname>. To do that, make sure that
10571057
functions that should communicate are owned by the same user, and mark

‎doc/src/sgml/pltcl.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ $$ LANGUAGE pltcl;
279279
functions will share the same global variables if and only if they are
280280
executed by the same SQL role. In an application wherein a single
281281
session executes code under multiple SQL roles (via <literal>SECURITY
282-
DEFINER</literal> functions, use of <command>SET ROLE</command>, etc) you may need to
282+
DEFINER</literal> functions, use of <command>SET ROLE</command>, etc.) you may need to
283283
take explicit steps to ensure that PL/Tcl functions can share data. To
284284
do that, make sure that functions that should communicate are owned by
285285
the same user, and mark them <literal>SECURITY DEFINER</literal>. You must of

‎doc/src/sgml/postgres-fdw.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ OPTIONS (ADD password_required 'false');
190190
on the <literal>public</literal> role. Keep in mind that the mapped
191191
user can potentially use any client certificates,
192192
<filename>.pgpass</filename>,
193-
<filename>.pg_service.conf</filename> etc in the unix home directory of the
193+
<filename>.pg_service.conf</filename> etc. in the unix home directory of the
194194
system user the postgres server runs as. They can also use any trust
195195
relationship granted by authentication modes like <literal>peer</literal>
196196
or <literal>ident</literal> authentication.

‎doc/src/sgml/protocol.sgml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
<firstterm>bind</firstterm> step, which creates a portal given a prepared
149149
statement and values for any needed parameters; and an
150150
<firstterm>execute</firstterm> step that runs a portal's query. In the case of
151-
a query that returns rows (<command>SELECT</command>, <command>SHOW</command>, etc),
151+
a query that returns rows (<command>SELECT</command>, <command>SHOW</command>, etc.),
152152
the execute step can be told to fetch only
153153
a limited number of rows, so that multiple execute steps might be needed
154154
to complete the operation.
@@ -584,7 +584,7 @@
584584
<listitem>
585585
<para>
586586
Indicates that rows are about to be returned in response to
587-
a <command>SELECT</command>, <command>FETCH</command>, etc query.
587+
a <command>SELECT</command>, <command>FETCH</command>, etc. query.
588588
The contents of this message describe the column layout of the rows.
589589
This will be followed by a DataRow message for each row being returned
590590
to the frontend.
@@ -597,7 +597,7 @@
597597
<listitem>
598598
<para>
599599
One of the set of rows returned by
600-
a <command>SELECT</command>, <command>FETCH</command>, etc query.
600+
a <command>SELECT</command>, <command>FETCH</command>, etc. query.
601601
</para>
602602
</listitem>
603603
</varlistentry>
@@ -4203,7 +4203,7 @@ psql "dbname=postgres replication=database" -c "IDENTIFY_SYSTEM;"
42034203
<para>
42044204
0 indicates the overall <command>COPY</command> format is textual (rows
42054205
separated by newlines, columns separated by separator
4206-
characters, etc).
4206+
characters, etc.).
42074207
1 indicates the overall copy format is binary (similar
42084208
to DataRow format).
42094209
See <xref linkend="sql-copy"/>
@@ -4265,7 +4265,7 @@ psql "dbname=postgres replication=database" -c "IDENTIFY_SYSTEM;"
42654265
<para>
42664266
0 indicates the overall <command>COPY</command> format
42674267
is textual (rows separated by newlines, columns
4268-
separated by separator characters, etc). 1 indicates
4268+
separated by separator characters, etc.). 1 indicates
42694269
the overall copy format is binary (similar to DataRow
42704270
format). See <xref linkend="sql-copy"/> for more information.
42714271
</para>
@@ -4325,7 +4325,7 @@ psql "dbname=postgres replication=database" -c "IDENTIFY_SYSTEM;"
43254325
<para>
43264326
0 indicates the overall <command>COPY</command> format
43274327
is textual (rows separated by newlines, columns
4328-
separated by separator characters, etc). 1 indicates
4328+
separated by separator characters, etc.). 1 indicates
43294329
the overall copy format is binary (similar to DataRow
43304330
format). See <xref linkend="sql-copy"/> for more information.
43314331
</para>

‎doc/src/sgml/ref/values.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ UPDATE employees SET salary = salary * v.increase
203203
<command>SELECT</command>. It is not required that the <literal>AS</literal> clause
204204
specify names for all the columns, but it's good practice to do so.
205205
(The default column names for <command>VALUES</command> are <literal>column1</literal>,
206-
<literal>column2</literal>, etc in <productname>PostgreSQL</productname>, but
206+
<literal>column2</literal>, etc. in <productname>PostgreSQL</productname>, but
207207
these names might be different in other database systems.)
208208
</para>
209209

‎doc/src/sgml/sources.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
</para>
1414

1515
<para>
16-
Layout rules (brace positioning, etc) follow BSD conventions. In
16+
Layout rules (brace positioning, etc.) follow BSD conventions. In
1717
particular, curly braces for the controlled blocks of <literal>if</literal>,
18-
<literal>while</literal>, <literal>switch</literal>, etc go on their own lines.
18+
<literal>while</literal>, <literal>switch</literal>, etc. go on their own lines.
1919
</para>
2020

2121
<para>

‎doc/src/sgml/syntax.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1062,7 +1062,7 @@ CAST ( '<replaceable>string</replaceable>' AS <replaceable>type</replaceable> )
10621062
<entry><token>IS</token> <token>ISNULL</token> <token>NOTNULL</token></entry>
10631063
<entry></entry>
10641064
<entry><literal>IS TRUE</literal>, <literal>IS FALSE</literal>, <literal>IS
1065-
NULL</literal>, <literal>IS DISTINCT FROM</literal>, etc</entry>
1065+
NULL</literal>, <literal>IS DISTINCT FROM</literal>, etc.</entry>
10661066
</row>
10671067

10681068
<row>

‎doc/src/sgml/xfunc.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1256,7 +1256,7 @@ SELECT x, CASE WHEN x &gt; 0 THEN generate_series(1, 5) ELSE 0 END FROM tab;
12561256
described above; instead, a set-returning function could have at most
12571257
one set-returning argument, and each nest of set-returning functions
12581258
was run independently. Also, conditional execution (set-returning
1259-
functions inside <literal>CASE</literal> etc) was previously allowed,
1259+
functions inside <literal>CASE</literal> etc.) was previously allowed,
12601260
complicating things even more.
12611261
Use of the <literal>LATERAL</literal> syntax is recommended when writing
12621262
queries that need to work in older <productname>PostgreSQL</productname> versions,

‎doc/src/sgml/xml2.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ AS t(article_id integer, author text, page_count integer, title text);
304304
just <literal>SELECT *</literal> &mdash; it can reference the output
305305
columns by name or join them to other tables. The function produces a
306306
virtual table with which you can perform any operation you wish (e.g.,
307-
aggregation, joining, sorting etc). So we could also have:
307+
aggregation, joining, sorting etc.). So we could also have:
308308
<programlisting>
309309
SELECT t.title, p.fullname, p.email
310310
FROM xpath_table('article_id', 'article_xml', 'articles',

0 commit comments

Comments
 (0)