database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-05 09:19:17 +03:00
Code

doc: add commas after 'i.e.' and 'e.g.'

Browse Source 
This follows the American format,
https://jakubmarian.com/comma-after-i-e-and-e-g/. There is no intention
of requiring this format for future text, but making existing text
consistent every few years makes sense.

Discussion: https://postgr.es/m/20200825183619.GA22369@momjian.us

Backpatch-through: 9.5
This commit is contained in:
Bruce Momjian 2020-08-31 18:33:37 -04:00
parent e4263c4a56
commit b235936a1d
44 changed files with 103 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/src/sgml/config.sgml
View File

@ -408,7 +408,7 @@ include_dir 'directory'
start with the <literal>.</literal> character are also ignored, to start with the <literal>.</literal> character are also ignored, to
prevent mistakes since such files are hidden on some platforms. Multiple prevent mistakes since such files are hidden on some platforms. Multiple
files within an include directory are processed in file name order files within an include directory are processed in file name order
(according to C locale rules, i.e. numbers before letters, and (according to C locale rules, i.e., numbers before letters, and
uppercase letters before lowercase ones). uppercase letters before lowercase ones).
</para> </para>
@ -1047,7 +1047,7 @@ include_dir 'conf.d'
<para> <para>
With this parameter enabled, you can still create ordinary global With this parameter enabled, you can still create ordinary global
users. Simply append <literal>@</literal> when specifying the user users. Simply append <literal>@</literal> when specifying the user
name in the client, e.g. <literal>joe@</literal>. The <literal>@</literal> name in the client, e.g., <literal>joe@</literal>. The <literal>@</literal>
will be stripped off before the user name is looked up by the will be stripped off before the user name is looked up by the
server. server.
</para> </para>
@ -2975,7 +2975,7 @@ include_dir 'conf.d'
disabled, but the server continues to accumulate WAL segment files in disabled, but the server continues to accumulate WAL segment files in
the expectation that a command will soon be provided. Setting the expectation that a command will soon be provided. Setting
<varname>archive_command</varname> to a command that does nothing but <varname>archive_command</varname> to a command that does nothing but
return true, e.g. <literal>/bin/true</literal> (<literal>REM</literal> on return true, e.g., <literal>/bin/true</literal> (<literal>REM</literal> on
Windows), effectively disables Windows), effectively disables
archiving, but also breaks the chain of WAL files needed for archiving, but also breaks the chain of WAL files needed for
archive recovery, so it should only be used in unusual circumstances. archive recovery, so it should only be used in unusual circumstances.
@ -4017,7 +4017,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
if your data is likely to be completely in cache, such as when if your data is likely to be completely in cache, such as when
the database is smaller than the total server memory, decreasing the database is smaller than the total server memory, decreasing
random_page_cost can be appropriate. Storage that has a low random random_page_cost can be appropriate. Storage that has a low random
read cost relative to sequential, e.g. solid-state drives, might read cost relative to sequential, e.g., solid-state drives, might
also be better modeled with a lower value for random_page_cost, also be better modeled with a lower value for random_page_cost,
e.g., <literal>1.1</literal>. e.g., <literal>1.1</literal>.
</para> </para>
@ -7754,7 +7754,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
rows that can be locked; that value is unlimited. The default, rows that can be locked; that value is unlimited. The default,
64, has historically proven sufficient, but you might need to 64, has historically proven sufficient, but you might need to
raise this value if you have queries that touch many different raise this value if you have queries that touch many different
tables in a single transaction, e.g. query of a parent table with tables in a single transaction, e.g., query of a parent table with
many children. This parameter can only be set at server start. many children. This parameter can only be set at server start.
</para> </para>
@ -8279,7 +8279,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
with assertions enabled. That is the case if the with assertions enabled. That is the case if the
macro <symbol>USE_ASSERT_CHECKING</symbol> is defined macro <symbol>USE_ASSERT_CHECKING</symbol> is defined
when <productname>PostgreSQL</productname> is built (accomplished when <productname>PostgreSQL</productname> is built (accomplished
e.g. by the <command>configure</command> option e.g., by the <command>configure</command> option
<option>--enable-cassert</option>). By <option>--enable-cassert</option>). By
default <productname>PostgreSQL</productname> is built without default <productname>PostgreSQL</productname> is built without
assertions. assertions.

4
doc/src/sgml/datatype.sgml
View File

@ -507,7 +507,7 @@
very large number of digits. It is especially recommended for very large number of digits. It is especially recommended for
storing monetary amounts and other quantities where exactness is storing monetary amounts and other quantities where exactness is
required. Calculations with <type>numeric</type> values yield exact required. Calculations with <type>numeric</type> values yield exact
results where possible, e.g. addition, subtraction, multiplication. results where possible, e.g., addition, subtraction, multiplication.
However, calculations on <type>numeric</type> values are very slow However, calculations on <type>numeric</type> values are very slow
compared to the integer types, or to the floating-point types compared to the integer types, or to the floating-point types
described in the next section. described in the next section.
@ -4923,7 +4923,7 @@ SELECT * FROM pg_attribute
<row> <row>
<entry><type>unknown</type></entry> <entry><type>unknown</type></entry>
<entry>Identifies a not-yet-resolved type, e.g. of an undecorated <entry>Identifies a not-yet-resolved type, e.g., of an undecorated
string literal.</entry> string literal.</entry>
</row> </row>

4
doc/src/sgml/ddl.sgml
View File

@ -1253,7 +1253,7 @@ ALTER TABLE products ADD COLUMN description text;
</para> </para>
<para> <para>
However, if the default value is volatile (e.g. However, if the default value is volatile (e.g.,
<function>clock_timestamp()</function>) <function>clock_timestamp()</function>)
each row will need to be updated with the value calculated at the time each row will need to be updated with the value calculated at the time
<command>ALTER TABLE</command> is executed. To avoid a potentially <command>ALTER TABLE</command> is executed. To avoid a potentially
@ -1523,7 +1523,7 @@ ALTER TABLE products RENAME TO items;
<para> <para>
An object can be assigned to a new owner with an <command>ALTER</command> An object can be assigned to a new owner with an <command>ALTER</command>
command of the appropriate kind for the object, e.g. <xref command of the appropriate kind for the object, e.g., <xref
linkend="sql-altertable"/>. Superusers can always do linkend="sql-altertable"/>. Superusers can always do
this; ordinary roles can only do it if they are both the current owner this; ordinary roles can only do it if they are both the current owner
of the object (or a member of the owning role) and a member of the new of the object (or a member of the owning role) and a member of the new

6
doc/src/sgml/ecpg.sgml
View File

@ -3659,7 +3659,7 @@ EXEC SQL DEALLOCATE DESCRIPTOR <replaceable>identifier</replaceable>;
EXEC SQL FETCH NEXT FROM mycursor INTO SQL DESCRIPTOR mydesc; EXEC SQL FETCH NEXT FROM mycursor INTO SQL DESCRIPTOR mydesc;
</programlisting> </programlisting>
If the result set is empty, the Descriptor Area will still contain If the result set is empty, the Descriptor Area will still contain
the metadata from the query, i.e. the field names. the metadata from the query, i.e., the field names.
</para> </para>
<para> <para>
@ -4076,7 +4076,7 @@ typedef struct sqlvar_struct sqlvar_t;
<term><literal>sqllen</literal></term> <term><literal>sqllen</literal></term>
<listitem> <listitem>
<para> <para>
Contains the binary length of the field. e.g. 4 bytes for <type>ECPGt_int</type>. Contains the binary length of the field. e.g., 4 bytes for <type>ECPGt_int</type>.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -8014,7 +8014,7 @@ EXEC SQL CLOSE DATABASE;
<term><literal>FREE cursor_name</literal></term> <term><literal>FREE cursor_name</literal></term>
<listitem> <listitem>
<para> <para>
Due to the differences how ECPG works compared to Informix's ESQL/C (i.e. which steps Due to the differences how ECPG works compared to Informix's ESQL/C (i.e., which steps
are purely grammar transformations and which steps rely on the underlying run-time library) are purely grammar transformations and which steps rely on the underlying run-time library)
there is no <literal>FREE cursor_name</literal> statement in ECPG. This is because in ECPG, there is no <literal>FREE cursor_name</literal> statement in ECPG. This is because in ECPG,
<literal>DECLARE CURSOR</literal> doesn't translate to a function call into <literal>DECLARE CURSOR</literal> doesn't translate to a function call into

4
doc/src/sgml/extend.sgml
View File

@ -573,7 +573,7 @@
<para> <para>
An extension is <firstterm>relocatable</firstterm> if it is possible to move An extension is <firstterm>relocatable</firstterm> if it is possible to move
its contained objects into a different schema after initial creation its contained objects into a different schema after initial creation
of the extension. The default is <literal>false</literal>, i.e. the of the extension. The default is <literal>false</literal>, i.e., the
extension is not relocatable. extension is not relocatable.
See <xref linkend="extend-extensions-relocation"/> for more information. See <xref linkend="extend-extensions-relocation"/> for more information.
</para> </para>
@ -1438,7 +1438,7 @@ include $(PGXS)
<term><varname>NO_INSTALLCHECK</varname></term> <term><varname>NO_INSTALLCHECK</varname></term>
<listitem> <listitem>
<para> <para>
don't define an <literal>installcheck</literal> target, useful e.g. if tests require special configuration, or don't use <application>pg_regress</application> don't define an <literal>installcheck</literal> target, useful e.g., if tests require special configuration, or don't use <application>pg_regress</application>
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>

10
doc/src/sgml/func.sgml
View File

@ -6335,9 +6335,9 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
<listitem> <listitem>
<para> <para>
In <function>to_timestamp</function> and <function>to_date</function>, In <function>to_timestamp</function> and <function>to_date</function>,
if the year format specification is less than four digits, e.g. if the year format specification is less than four digits, e.g.,
<literal>YYY</literal>, and the supplied year is less than four digits, <literal>YYY</literal>, and the supplied year is less than four digits,
the year will be adjusted to be nearest to the year 2020, e.g. the year will be adjusted to be nearest to the year 2020, e.g.,
<literal>95</literal> becomes 1995. <literal>95</literal> becomes 1995.
</para> </para>
</listitem> </listitem>
@ -9786,7 +9786,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
<literal>"string"</literal> (to include all string values), <literal>"numeric"</literal> (to include all numeric values in the string format), <literal>"string"</literal> (to include all string values), <literal>"numeric"</literal> (to include all numeric values in the string format),
<literal>"boolean"</literal> (to include all Boolean values in the string format <literal>"true"</literal>/<literal>"false"</literal>), <literal>"boolean"</literal> (to include all Boolean values in the string format <literal>"true"</literal>/<literal>"false"</literal>),
<literal>"key"</literal> (to include all keys) or <literal>"all"</literal> (to include all above). These values <literal>"key"</literal> (to include all keys) or <literal>"all"</literal> (to include all above). These values
can be combined together to include, e.g. all string and numeric values. can be combined together to include, e.g., all string and numeric values.
</entry> </entry>
<entry><literal>json_to_tsvector('english', '{"a": "The Fat Rats", "b": 123}'::json, '["string", "numeric"]')</literal></entry> <entry><literal>json_to_tsvector('english', '{"a": "The Fat Rats", "b": 123}'::json, '["string", "numeric"]')</literal></entry>
<entry><literal>'123':5 'fat':2 'rat':3</literal></entry> <entry><literal>'123':5 'fat':2 'rat':3</literal></entry>
@ -20796,7 +20796,7 @@ FOR EACH ROW EXECUTE FUNCTION suppress_redundant_updates_trigger();
<row> <row>
<entry><literal>objsubid</literal></entry> <entry><literal>objsubid</literal></entry>
<entry><type>integer</type></entry> <entry><type>integer</type></entry>
<entry>Sub-object ID (e.g. attribute number for a column)</entry> <entry>Sub-object ID (e.g., attribute number for a column)</entry>
</row> </row>
<row> <row>
<entry><literal>command_tag</literal></entry> <entry><literal>command_tag</literal></entry>
@ -20883,7 +20883,7 @@ FOR EACH ROW EXECUTE FUNCTION suppress_redundant_updates_trigger();
<row> <row>
<entry><literal>objsubid</literal></entry> <entry><literal>objsubid</literal></entry>
<entry><type>integer</type></entry> <entry><type>integer</type></entry>
<entry>Sub-object ID (e.g. attribute number for a column)</entry> <entry>Sub-object ID (e.g., attribute number for a column)</entry>
</row> </row>
<row> <row>
<entry><literal>original</literal></entry> <entry><literal>original</literal></entry>

8
doc/src/sgml/high-availability.sgml
View File

@ -219,7 +219,7 @@ protocol to make nodes agree on a serializable transactional order.
this is unacceptable, either the middleware or the application this is unacceptable, either the middleware or the application
must query such values from a single server and then use those must query such values from a single server and then use those
values in write queries. Another option is to use this replication values in write queries. Another option is to use this replication
option with a traditional master-standby setup, i.e. data modification option with a traditional master-standby setup, i.e., data modification
queries are sent only to the master and are propagated to the queries are sent only to the master and are propagated to the
standby servers via master-standby replication, not by the replication standby servers via master-standby replication, not by the replication
middleware. Care must also be taken that all middleware. Care must also be taken that all
@ -657,7 +657,7 @@ protocol to make nodes agree on a serializable transactional order.
Set up continuous archiving on the primary to an archive directory Set up continuous archiving on the primary to an archive directory
accessible from the standby, as described accessible from the standby, as described
in <xref linkend="continuous-archiving"/>. The archive location should be in <xref linkend="continuous-archiving"/>. The archive location should be
accessible from the standby even when the master is down, i.e. it should accessible from the standby even when the master is down, i.e., it should
reside on the standby server itself or another trusted server, not on reside on the standby server itself or another trusted server, not on
the master server. the master server.
</para> </para>
@ -2224,7 +2224,7 @@ LOG: database system is ready to accept read only connections
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para> <para>
Data Definition Language (DDL) - e.g. <command>CREATE INDEX</command> Data Definition Language (DDL) - e.g., <command>CREATE INDEX</command>
</para> </para>
</listitem> </listitem>
<listitem> <listitem>
@ -2290,7 +2290,7 @@ LOG: database system is ready to accept read only connections
<para> <para>
WAL file control commands will not work during recovery, WAL file control commands will not work during recovery,
e.g. <function>pg_start_backup</function>, <function>pg_switch_wal</function> etc. e.g., <function>pg_start_backup</function>, <function>pg_switch_wal</function> etc.
</para> </para>
<para> <para>

2
doc/src/sgml/indexam.sgml
View File

@ -370,7 +370,7 @@ amcanreturn (Relation indexRelation, int attno);
linkend="indexes-index-only-scans"><firstterm>index-only scans</firstterm></link> on linkend="indexes-index-only-scans"><firstterm>index-only scans</firstterm></link> on
the given column, by returning the indexed column values for an index entry the given column, by returning the indexed column values for an index entry
in the form of an <structname>IndexTuple</structname>. The attribute number in the form of an <structname>IndexTuple</structname>. The attribute number
is 1-based, i.e. the first column's attno is 1. Returns true if supported, is 1-based, i.e., the first column's attno is 1. Returns true if supported,
else false. If the access method does not support index-only scans at all, else false. If the access method does not support index-only scans at all,
the <structfield>amcanreturn</structfield> field in its <structname>IndexAmRoutine</structname> the <structfield>amcanreturn</structfield> field in its <structname>IndexAmRoutine</structname>
struct can be set to NULL. struct can be set to NULL.

4
doc/src/sgml/install-windows.sgml
View File

@ -108,7 +108,7 @@
In the <productname>Microsoft Windows SDK</productname>, start the In the <productname>Microsoft Windows SDK</productname>, start the
<application>CMD shell</application> listed under the SDK on the Start Menu. <application>CMD shell</application> listed under the SDK on the Start Menu.
In recent SDK versions you can change the targeted CPU architecture, build In recent SDK versions you can change the targeted CPU architecture, build
type, and target OS by using the <command>setenv</command> command, e.g. type, and target OS by using the <command>setenv</command> command, e.g.,
<command>setenv /x86 /release /xp</command> to target Windows XP or later <command>setenv /x86 /release /xp</command> to target Windows XP or later
with a 32-bit release build. See <command>/?</command> for other options to with a 32-bit release build. See <command>/?</command> for other options to
<command>setenv</command>. All commands should be run from the <command>setenv</command>. All commands should be run from the
@ -241,7 +241,7 @@ $ENV{MSBFLAGS}="/m";
installations <filename>C:\Program Files\GnuWin32</filename>. installations <filename>C:\Program Files\GnuWin32</filename>.
Consider installing into <filename>C:\GnuWin32</filename> or use the Consider installing into <filename>C:\GnuWin32</filename> or use the
NTFS short name path to GnuWin32 in your PATH environment setting NTFS short name path to GnuWin32 in your PATH environment setting
(e.g. <filename>C:\PROGRA~1\GnuWin32</filename>). (e.g., <filename>C:\PROGRA~1\GnuWin32</filename>).
</para> </para>
</note> </note>

16
doc/src/sgml/libpq.sgml
View File

@ -355,7 +355,7 @@ PostgresPollingStatusType PQconnectPoll(PGconn *conn);
Conversely, if <function>PQconnectPoll(conn)</function> last returned Conversely, if <function>PQconnectPoll(conn)</function> last returned
<symbol>PGRES_POLLING_WRITING</symbol>, wait until the socket is ready <symbol>PGRES_POLLING_WRITING</symbol>, wait until the socket is ready
to write, then call <function>PQconnectPoll(conn)</function> again. to write, then call <function>PQconnectPoll(conn)</function> again.
On the first iteration, i.e. if you have yet to call On the first iteration, i.e., if you have yet to call
<function>PQconnectPoll</function>, behave as if it last returned <function>PQconnectPoll</function>, behave as if it last returned
<symbol>PGRES_POLLING_WRITING</symbol>. Continue this loop until <symbol>PGRES_POLLING_WRITING</symbol>. Continue this loop until
<function>PQconnectPoll(conn)</function> returns <function>PQconnectPoll(conn)</function> returns
@ -860,7 +860,7 @@ postgresql:///mydb?host=localhost&amp;port=5433
<para> <para>
Percent-encoding may be used to include symbols with special meaning in any Percent-encoding may be used to include symbols with special meaning in any
of the <acronym>URI</acronym> parts, e.g. replace <literal>=</literal> with of the <acronym>URI</acronym> parts, e.g., replace <literal>=</literal> with
<literal>%3D</literal>. <literal>%3D</literal>.
</para> </para>
@ -919,7 +919,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
<literal>hostaddr</literal>, and <literal>port</literal> options accept a comma-separated <literal>hostaddr</literal>, and <literal>port</literal> options accept a comma-separated
list of values. The same number of elements must be given in each list of values. The same number of elements must be given in each
option that is specified, such option that is specified, such
that e.g. the first <literal>hostaddr</literal> corresponds to the first host name, that e.g., the first <literal>hostaddr</literal> corresponds to the first host name,
the second <literal>hostaddr</literal> corresponds to the second host name, and so the second <literal>hostaddr</literal> corresponds to the second host name, and so
forth. As an exception, if only one <literal>port</literal> is specified, it forth. As an exception, if only one <literal>port</literal> is specified, it
applies to all the hosts. applies to all the hosts.
@ -947,7 +947,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
<para> <para>
If a password file is used, you can have different passwords for If a password file is used, you can have different passwords for
different hosts. All the other connection options are the same for every different hosts. All the other connection options are the same for every
host in the list; it is not possible to e.g. specify different host in the list; it is not possible to e.g., specify different
usernames for different hosts. usernames for different hosts.
</para> </para>
</sect3> </sect3>
@ -1123,7 +1123,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
<listitem> <listitem>
<para> <para>
Maximum wait for connection, in seconds (write as a decimal integer, Maximum wait for connection, in seconds (write as a decimal integer,
e.g. <literal>10</literal>). Zero, negative, or not specified means e.g., <literal>10</literal>). Zero, negative, or not specified means
wait indefinitely. The minimum allowed timeout is 2 seconds, therefore wait indefinitely. The minimum allowed timeout is 2 seconds, therefore
a value of <literal>1</literal> is interpreted as <literal>2</literal>. a value of <literal>1</literal> is interpreted as <literal>2</literal>.
This timeout applies separately to each host name or IP address. This timeout applies separately to each host name or IP address.
@ -2231,7 +2231,7 @@ const char *PQsslAttribute(const PGconn *conn, const char *attribute_name);
<term><literal>cipher</literal></term> <term><literal>cipher</literal></term>
<listitem> <listitem>
<para> <para>
A short name of the ciphersuite used, e.g. A short name of the ciphersuite used, e.g.,
<literal>"DHE-RSA-DES-CBC3-SHA"</literal>. The names are specific <literal>"DHE-RSA-DES-CBC3-SHA"</literal>. The names are specific
to each SSL implementation. to each SSL implementation.
</para> </para>
@ -4880,7 +4880,7 @@ int PQflush(PGconn *conn);
<function>PQflush</function> again. Repeat until <function>PQflush</function> again. Repeat until
<function>PQflush</function> returns 0. (It is necessary to check for <function>PQflush</function> returns 0. (It is necessary to check for
read-ready and drain the input with <function>PQconsumeInput</function>, read-ready and drain the input with <function>PQconsumeInput</function>,
because the server can block trying to send us data, e.g. NOTICE because the server can block trying to send us data, e.g., NOTICE
messages, and won't read our data until we read its.) Once messages, and won't read our data until we read its.) Once
<function>PQflush</function> returns 0, wait for the socket to be <function>PQflush</function> returns 0, wait for the socket to be
read-ready and then read the response as described above. read-ready and then read the response as described above.
@ -7889,7 +7889,7 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
For a connection to be known secure, SSL usage must be configured For a connection to be known secure, SSL usage must be configured
on <emphasis>both the client and the server</emphasis> before the connection on <emphasis>both the client and the server</emphasis> before the connection
is made. If it is only configured on the server, the client may end up is made. If it is only configured on the server, the client may end up
sending sensitive information (e.g. passwords) before sending sensitive information (e.g., passwords) before
it knows that the server requires high security. In libpq, secure it knows that the server requires high security. In libpq, secure
connections can be ensured connections can be ensured
by setting the <literal>sslmode</literal> parameter to <literal>verify-full</literal> or by setting the <literal>sslmode</literal> parameter to <literal>verify-full</literal> or

2
doc/src/sgml/monitoring.sgml
View File

@ -206,7 +206,7 @@ postgres 27093 0.0 0.0 30096 2752 ? Ss 11:34 0:00 postgres: ser
When the server shuts down cleanly, a permanent copy of the statistics When the server shuts down cleanly, a permanent copy of the statistics
data is stored in the <filename>pg_stat</filename> subdirectory, so that data is stored in the <filename>pg_stat</filename> subdirectory, so that
statistics can be retained across server restarts. When recovery is statistics can be retained across server restarts. When recovery is
performed at server start (e.g. after immediate shutdown, server crash, performed at server start (e.g., after immediate shutdown, server crash,
and point-in-time recovery), all statistics counters are reset. and point-in-time recovery), all statistics counters are reset.
</para> </para>

2
doc/src/sgml/mvcc.sgml
View File

@ -269,7 +269,7 @@
<para> <para>
In <productname>PostgreSQL</productname>, you can request any of In <productname>PostgreSQL</productname>, you can request any of
the four standard transaction isolation levels, but internally only the four standard transaction isolation levels, but internally only
three distinct isolation levels are implemented, i.e. PostgreSQL's three distinct isolation levels are implemented, i.e., PostgreSQL's
Read Uncommitted mode behaves like Read Committed. This is because Read Uncommitted mode behaves like Read Committed. This is because
it is the only sensible way to map the standard isolation levels to it is the only sensible way to map the standard isolation levels to
PostgreSQL's multiversion concurrency control architecture. PostgreSQL's multiversion concurrency control architecture.

4
doc/src/sgml/parallel.sgml
View File

@ -458,7 +458,7 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
<xref linkend="guc-parallel-tuple-cost"/>. Of course, this plan may turn <xref linkend="guc-parallel-tuple-cost"/>. Of course, this plan may turn
out to be slower than the serial plan which the planner preferred, but out to be slower than the serial plan which the planner preferred, but
this will not always be the case. If you don't get a parallel this will not always be the case. If you don't get a parallel
plan even with very small values of these settings (e.g. after setting plan even with very small values of these settings (e.g., after setting
them both to zero), there may be some reason why the query planner is them both to zero), there may be some reason why the query planner is
unable to generate a parallel plan for your query. See unable to generate a parallel plan for your query. See
<xref linkend="when-can-parallel-query-be-used"/> and <xref linkend="when-can-parallel-query-be-used"/> and
@ -556,7 +556,7 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
<para> <para>
Functions and aggregates must be marked <literal>PARALLEL UNSAFE</literal> if Functions and aggregates must be marked <literal>PARALLEL UNSAFE</literal> if
they write to the database, access sequences, change the transaction state they write to the database, access sequences, change the transaction state
even temporarily (e.g. a PL/pgSQL function which establishes an even temporarily (e.g., a PL/pgSQL function which establishes an
<literal>EXCEPTION</literal> block to catch errors), or make persistent changes to <literal>EXCEPTION</literal> block to catch errors), or make persistent changes to
settings. Similarly, functions must be marked <literal>PARALLEL settings. Similarly, functions must be marked <literal>PARALLEL
RESTRICTED</literal> if they access temporary tables, client connection state, RESTRICTED</literal> if they access temporary tables, client connection state,

2
doc/src/sgml/perform.sgml
View File

@ -1821,7 +1821,7 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
<listitem> <listitem>
<para> <para>
Place the database cluster's data directory in a memory-backed Place the database cluster's data directory in a memory-backed
file system (i.e. <acronym>RAM</acronym> disk). This eliminates all file system (i.e., <acronym>RAM</acronym> disk). This eliminates all
database disk I/O, but limits data storage to the amount of database disk I/O, but limits data storage to the amount of
available memory (and perhaps swap). available memory (and perhaps swap).
</para> </para>

4
doc/src/sgml/protocol.sgml
View File

@ -28,7 +28,7 @@
the server, the connection will be rejected (for example, this would occur the server, the connection will be rejected (for example, this would occur
if the client requested protocol version 4.0, which does not exist as of if the client requested protocol version 4.0, which does not exist as of
this writing). If the minor version requested by the client is not this writing). If the minor version requested by the client is not
supported by the server (e.g. the client requests version 3.1, but the supported by the server (e.g., the client requests version 3.1, but the
server supports only 3.0), the server may either reject the connection or server supports only 3.0), the server may either reject the connection or
may respond with a NegotiateProtocolVersion message containing the highest may respond with a NegotiateProtocolVersion message containing the highest
minor protocol version which it supports. The client may then choose either minor protocol version which it supports. The client may then choose either
@ -422,7 +422,7 @@
by the client, but does support an earlier version of the protocol; by the client, but does support an earlier version of the protocol;
this message indicates the highest supported minor version. This this message indicates the highest supported minor version. This
message will also be sent if the client requested unsupported protocol message will also be sent if the client requested unsupported protocol
options (i.e. beginning with <literal>_pq_.</literal>) in the options (i.e., beginning with <literal>_pq_.</literal>) in the
startup packet. This message will be followed by an ErrorResponse or startup packet. This message will be followed by an ErrorResponse or
a message indicating the success or failure of authentication. a message indicating the success or failure of authentication.
</para> </para>

4
doc/src/sgml/queries.sgml
View File

@ -1256,7 +1256,7 @@ GROUPING SETS (
( ) ( )
) )
</programlisting> </programlisting>
This is commonly used for analysis over hierarchical data; e.g. total This is commonly used for analysis over hierarchical data; e.g., total
salary by department, division, and company-wide total. salary by department, division, and company-wide total.
</para> </para>
@ -1265,7 +1265,7 @@ GROUPING SETS (
<programlisting> <programlisting>
CUBE ( <replaceable>e1</replaceable>, <replaceable>e2</replaceable>, ... ) CUBE ( <replaceable>e1</replaceable>, <replaceable>e2</replaceable>, ... )
</programlisting> </programlisting>
represents the given list and all of its possible subsets (i.e. the power represents the given list and all of its possible subsets (i.e., the power
set). Thus set). Thus
<programlisting> <programlisting>
CUBE ( a, b, c ) CUBE ( a, b, c )

2
doc/src/sgml/recovery-config.sgml
View File

@ -173,7 +173,7 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows
<listitem> <listitem>
<para> <para>
This parameter specifies that recovery should end as soon as a This parameter specifies that recovery should end as soon as a
consistent state is reached, i.e. as early as possible. When restoring consistent state is reached, i.e., as early as possible. When restoring
from an online backup, this means the point where taking the backup from an online backup, this means the point where taking the backup
ended. ended.
</para> </para>

4
doc/src/sgml/ref/create_database.sgml
View File

@ -116,7 +116,7 @@ CREATE DATABASE <replaceable class="parameter">name</replaceable>
<listitem> <listitem>
<para> <para>
Collation order (<literal>LC_COLLATE</literal>) to use in the new database. Collation order (<literal>LC_COLLATE</literal>) to use in the new database.
This affects the sort order applied to strings, e.g. in queries with This affects the sort order applied to strings, e.g., in queries with
ORDER BY, as well as the order used in indexes on text columns. ORDER BY, as well as the order used in indexes on text columns.
The default is to use the collation order of the template database. The default is to use the collation order of the template database.
See below for additional restrictions. See below for additional restrictions.
@ -128,7 +128,7 @@ CREATE DATABASE <replaceable class="parameter">name</replaceable>
<listitem> <listitem>
<para> <para>
Character classification (<literal>LC_CTYPE</literal>) to use in the new Character classification (<literal>LC_CTYPE</literal>) to use in the new
database. This affects the categorization of characters, e.g. lower, database. This affects the categorization of characters, e.g., lower,
upper and digit. The default is to use the character classification of upper and digit. The default is to use the character classification of
the template database. See below for additional restrictions. the template database. See below for additional restrictions.
</para> </para>

2
doc/src/sgml/ref/create_event_trigger.sgml
View File

@ -86,7 +86,7 @@ CREATE EVENT TRIGGER <replaceable class="parameter">name</replaceable>
A list of values for the A list of values for the
associated <replaceable class="parameter">filter_variable</replaceable> associated <replaceable class="parameter">filter_variable</replaceable>
for which the trigger should fire. For <literal>TAG</literal>, this means a for which the trigger should fire. For <literal>TAG</literal>, this means a
list of command tags (e.g. <literal>'DROP FUNCTION'</literal>). list of command tags (e.g., <literal>'DROP FUNCTION'</literal>).
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>

6
doc/src/sgml/ref/create_function.sgml
View File

@ -256,7 +256,7 @@ CREATE [ OR REPLACE ] FUNCTION
The name of the language that the function is implemented in. The name of the language that the function is implemented in.
It can be <literal>sql</literal>, <literal>c</literal>, It can be <literal>sql</literal>, <literal>c</literal>,
<literal>internal</literal>, or the name of a user-defined <literal>internal</literal>, or the name of a user-defined
procedural language, e.g. <literal>plpgsql</literal>. Enclosing the procedural language, e.g., <literal>plpgsql</literal>. Enclosing the
name in single quotes is deprecated and requires matching case. name in single quotes is deprecated and requires matching case.
</para> </para>
</listitem> </listitem>
@ -430,11 +430,11 @@ CREATE [ OR REPLACE ] FUNCTION
Functions should be labeled parallel unsafe if they modify any database Functions should be labeled parallel unsafe if they modify any database
state, or if they make changes to the transaction such as using state, or if they make changes to the transaction such as using
sub-transactions, or if they access sequences or attempt to make sub-transactions, or if they access sequences or attempt to make
persistent changes to settings (e.g. <literal>setval</literal>). They should persistent changes to settings (e.g., <literal>setval</literal>). They should
be labeled as parallel restricted if they access temporary tables, be labeled as parallel restricted if they access temporary tables,
client connection state, cursors, prepared statements, or miscellaneous client connection state, cursors, prepared statements, or miscellaneous
backend-local state which the system cannot synchronize in parallel mode backend-local state which the system cannot synchronize in parallel mode
(e.g. <literal>setseed</literal> cannot be executed other than by the group (e.g., <literal>setseed</literal> cannot be executed other than by the group
leader because a change made by another process would not be reflected leader because a change made by another process would not be reflected
in the leader). In general, if a function is labeled as being safe when in the leader). In general, if a function is labeled as being safe when
it is restricted or unsafe, or if it is labeled as being restricted when it is restricted or unsafe, or if it is labeled as being restricted when

2
doc/src/sgml/ref/create_procedure.sgml
View File

@ -164,7 +164,7 @@ CREATE [ OR REPLACE ] PROCEDURE
The name of the language that the procedure is implemented in. The name of the language that the procedure is implemented in.
It can be <literal>sql</literal>, <literal>c</literal>, It can be <literal>sql</literal>, <literal>c</literal>,
<literal>internal</literal>, or the name of a user-defined <literal>internal</literal>, or the name of a user-defined
procedural language, e.g. <literal>plpgsql</literal>. Enclosing the procedural language, e.g., <literal>plpgsql</literal>. Enclosing the
name in single quotes is deprecated and requires matching case. name in single quotes is deprecated and requires matching case.
</para> </para>
</listitem> </listitem>

2
doc/src/sgml/ref/create_statistics.sgml
View File

@ -129,7 +129,7 @@ CREATE STATISTICS [ IF NOT EXISTS ] <replaceable class="parameter">statistics_na
<title>Examples</title> <title>Examples</title>
<para> <para>
Create table <structname>t1</structname> with two functionally dependent columns, i.e. Create table <structname>t1</structname> with two functionally dependent columns, i.e.,
knowledge of a value in the first column is sufficient for determining the knowledge of a value in the first column is sufficient for determining the
value in the other column. Then functional dependency statistics are built value in the other column. Then functional dependency statistics are built
on those columns: on those columns:

4
doc/src/sgml/ref/create_table.sgml
View File

@ -813,7 +813,7 @@ WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
one or more columns on which the uniqueness is not enforced. one or more columns on which the uniqueness is not enforced.
Note that although the constraint is not enforced on the included columns, Note that although the constraint is not enforced on the included columns,
it still depends on them. Consequently, some operations on these columns it still depends on them. Consequently, some operations on these columns
(e.g. <literal>DROP COLUMN</literal>) can cause cascaded constraint and (e.g., <literal>DROP COLUMN</literal>) can cause cascaded constraint and
index deletion. index deletion.
</para> </para>
</listitem> </listitem>
@ -859,7 +859,7 @@ WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
of columns to be specified which will be included in the non-key portion of columns to be specified which will be included in the non-key portion
of the index. Although uniqueness is not enforced on the included columns, of the index. Although uniqueness is not enforced on the included columns,
the constraint still depends on them. Consequently, some operations on the the constraint still depends on them. Consequently, some operations on the
included columns (e.g. <literal>DROP COLUMN</literal>) can cause cascaded included columns (e.g., <literal>DROP COLUMN</literal>) can cause cascaded
constraint and index deletion. constraint and index deletion.
</para> </para>
</listitem> </listitem>

2
doc/src/sgml/ref/grant.sgml
View File

@ -357,7 +357,7 @@ GRANT <replaceable class="parameter">role_name</replaceable> [, ...] TO <replace
schema (assuming that the objects' own privilege requirements are schema (assuming that the objects' own privilege requirements are
also met). Essentially this allows the grantee to <quote>look up</quote> also met). Essentially this allows the grantee to <quote>look up</quote>
objects within the schema. Without this permission, it is still objects within the schema. Without this permission, it is still
possible to see the object names, e.g. by querying the system tables. possible to see the object names, e.g., by querying the system tables.
Also, after revoking this permission, existing backends might have Also, after revoking this permission, existing backends might have
statements that have previously performed this lookup, so this is not statements that have previously performed this lookup, so this is not
a completely secure way to prevent object access. a completely secure way to prevent object access.

2
doc/src/sgml/ref/initdb.sgml
View File

@ -88,7 +88,7 @@ PostgreSQL documentation
<command>initdb</command> initializes the database cluster's default <command>initdb</command> initializes the database cluster's default
locale and character set encoding. The character set encoding, locale and character set encoding. The character set encoding,
collation order (<literal>LC_COLLATE</literal>) and character set classes collation order (<literal>LC_COLLATE</literal>) and character set classes
(<literal>LC_CTYPE</literal>, e.g. upper, lower, digit) can be set separately (<literal>LC_CTYPE</literal>, e.g., upper, lower, digit) can be set separately
for a database when it is created. <command>initdb</command> determines for a database when it is created. <command>initdb</command> determines
those settings for the <literal>template1</literal> database, which will those settings for the <literal>template1</literal> database, which will
serve as the default for all other databases. serve as the default for all other databases.

2
doc/src/sgml/ref/pg_dump.sgml
View File

@ -763,7 +763,7 @@ PostgreSQL documentation
<term><option>--if-exists</option></term> <term><option>--if-exists</option></term>
<listitem> <listitem>
<para> <para>
Use conditional commands (i.e. add an <literal>IF EXISTS</literal> Use conditional commands (i.e., add an <literal>IF EXISTS</literal>
clause) when cleaning database objects. This option is not valid clause) when cleaning database objects. This option is not valid
unless <option>--clean</option> is also specified. unless <option>--clean</option> is also specified.
</para> </para>

2
doc/src/sgml/ref/pg_dumpall.sgml
View File

@ -305,7 +305,7 @@ PostgreSQL documentation
<term><option>--if-exists</option></term> <term><option>--if-exists</option></term>
<listitem> <listitem>
<para> <para>
Use conditional commands (i.e. add an <literal>IF EXISTS</literal> Use conditional commands (i.e., add an <literal>IF EXISTS</literal>
clause) to drop databases and other objects. This option is not valid clause) to drop databases and other objects. This option is not valid
unless <option>--clean</option> is also specified. unless <option>--clean</option> is also specified.
</para> </para>

2
doc/src/sgml/ref/pg_restore.sgml
View File

@ -571,7 +571,7 @@ PostgreSQL documentation
<term><option>--if-exists</option></term> <term><option>--if-exists</option></term>
<listitem> <listitem>
<para> <para>
Use conditional commands (i.e. add an <literal>IF EXISTS</literal> Use conditional commands (i.e., add an <literal>IF EXISTS</literal>
clause) to drop database objects. This option is not valid clause) to drop database objects. This option is not valid
unless <option>--clean</option> is also specified. unless <option>--clean</option> is also specified.
</para> </para>

2
doc/src/sgml/ref/pg_rewind.sgml
View File

@ -70,7 +70,7 @@ PostgreSQL documentation
files might no longer be present. In that case, they can be manually files might no longer be present. In that case, they can be manually
copied from the WAL archive to the <filename>pg_wal</filename> directory, or copied from the WAL archive to the <filename>pg_wal</filename> directory, or
fetched on startup by configuring <filename>recovery.conf</filename>. The use of fetched on startup by configuring <filename>recovery.conf</filename>. The use of
<application>pg_rewind</application> is not limited to failover, e.g. a standby <application>pg_rewind</application> is not limited to failover, e.g., a standby
server can be promoted, run some write transactions, and then rewinded server can be promoted, run some write transactions, and then rewinded
to become a standby again. to become a standby again.
</para> </para>

10
doc/src/sgml/ref/pgbench.sgml
View File

@ -561,7 +561,7 @@ pgbench <optional> <replaceable>options</replaceable> </optional> <replaceable>d
transaction to finish. The wait time is called the schedule lag time, transaction to finish. The wait time is called the schedule lag time,
and its average and maximum are also reported separately. The and its average and maximum are also reported separately. The
transaction latency with respect to the actual transaction start time, transaction latency with respect to the actual transaction start time,
i.e. the time spent executing the transaction in the database, can be i.e., the time spent executing the transaction in the database, can be
computed by subtracting the schedule lag time from the reported computed by subtracting the schedule lag time from the reported
latency. latency.
</para> </para>
@ -711,7 +711,7 @@ pgbench <optional> <replaceable>options</replaceable> </optional> <replaceable>d
client per thread and there are no external or data dependencies. client per thread and there are no external or data dependencies.
From a statistical viewpoint reproducing runs exactly is a bad idea because From a statistical viewpoint reproducing runs exactly is a bad idea because
it can hide the performance variability or improve performance unduly, it can hide the performance variability or improve performance unduly,
e.g. by hitting the same pages as a previous run. e.g., by hitting the same pages as a previous run.
However, it may also be of great help for debugging, for instance However, it may also be of great help for debugging, for instance
re-running a tricky case which leads to an error. re-running a tricky case which leads to an error.
Use wisely. Use wisely.
@ -731,7 +731,7 @@ pgbench <optional> <replaceable>options</replaceable> </optional> <replaceable>d
<para> <para>
Remember to take the sampling rate into account when processing the Remember to take the sampling rate into account when processing the
log file. For example, when computing TPS values, you need to multiply log file. For example, when computing TPS values, you need to multiply
the numbers accordingly (e.g. with 0.01 sample rate, you'll only get the numbers accordingly (e.g., with 0.01 sample rate, you'll only get
1/100 of the actual TPS). 1/100 of the actual TPS).
</para> </para>
</listitem> </listitem>
@ -1479,7 +1479,7 @@ f(x) = PHI(2.0 * parameter * (x - mu) / (max - min + 1)) /
<literal>2.0 / parameter</literal>, that is a relative <literal>2.0 / parameter</literal>, that is a relative
<literal>1.0 / parameter</literal> around the mean; for instance, if <literal>1.0 / parameter</literal> around the mean; for instance, if
<replaceable>parameter</replaceable> is 4.0, 67% of values are drawn from the <replaceable>parameter</replaceable> is 4.0, 67% of values are drawn from the
middle quarter (1.0 / 4.0) of the interval (i.e. from middle quarter (1.0 / 4.0) of the interval (i.e., from
<literal>3.0 / 8.0</literal> to <literal>5.0 / 8.0</literal>) and 95% from <literal>3.0 / 8.0</literal> to <literal>5.0 / 8.0</literal>) and 95% from
the middle half (<literal>2.0 / 4.0</literal>) of the interval (second and third the middle half (<literal>2.0 / 4.0</literal>) of the interval (second and third
quartiles). The minimum <replaceable>parameter</replaceable> is 2.0 for performance quartiles). The minimum <replaceable>parameter</replaceable> is 2.0 for performance
@ -1679,7 +1679,7 @@ END;
and <replaceable>max_lag</replaceable>, are only present if the <option>--rate</option> and <replaceable>max_lag</replaceable>, are only present if the <option>--rate</option>
option is used. option is used.
They provide statistics about the time each transaction had to wait for the They provide statistics about the time each transaction had to wait for the
previous one to finish, i.e. the difference between each transaction's previous one to finish, i.e., the difference between each transaction's
scheduled start time and the time it actually started. scheduled start time and the time it actually started.
The very last field, <replaceable>skipped</replaceable>, The very last field, <replaceable>skipped</replaceable>,
is only present if the <option>--latency-limit</option> option is used, too. is only present if the <option>--latency-limit</option> option is used, too.

24
doc/src/sgml/ref/pgupgrade.sgml
View File

@ -41,8 +41,8 @@ PostgreSQL documentation
<application>pg_upgrade</application> (formerly called <application>pg_migrator</application>) allows data <application>pg_upgrade</application> (formerly called <application>pg_migrator</application>) allows data
stored in <productname>PostgreSQL</productname> data files to be upgraded to a later <productname>PostgreSQL</productname> stored in <productname>PostgreSQL</productname> data files to be upgraded to a later <productname>PostgreSQL</productname>
major version without the data dump/reload typically required for major version without the data dump/reload typically required for
major version upgrades, e.g. from 9.5.8 to 9.6.4 or from 10.7 to 11.2. major version upgrades, e.g., from 9.5.8 to 9.6.4 or from 10.7 to 11.2.
It is not required for minor version upgrades, e.g. from 9.6.2 to 9.6.3 It is not required for minor version upgrades, e.g., from 9.6.2 to 9.6.3
or from 10.1 to 10.2. or from 10.1 to 10.2.
</para> </para>
@ -60,7 +60,7 @@ PostgreSQL documentation
<para> <para>
<application>pg_upgrade</application> does its best to <application>pg_upgrade</application> does its best to
make sure the old and new clusters are binary-compatible, e.g. by make sure the old and new clusters are binary-compatible, e.g., by
checking for compatible compile-time settings, including 32/64-bit checking for compatible compile-time settings, including 32/64-bit
binaries. It is important that binaries. It is important that
any external modules are also binary compatible, though this cannot any external modules are also binary compatible, though this cannot
@ -209,13 +209,13 @@ PostgreSQL documentation
<title>Optionally move the old cluster</title> <title>Optionally move the old cluster</title>
<para> <para>
If you are using a version-specific installation directory, e.g. If you are using a version-specific installation directory, e.g.,
<filename>/opt/PostgreSQL/&majorversion;</filename>, you do not need to move the old cluster. The <filename>/opt/PostgreSQL/&majorversion;</filename>, you do not need to move the old cluster. The
graphical installers all use version-specific installation directories. graphical installers all use version-specific installation directories.
</para> </para>
<para> <para>
If your installation directory is not version-specific, e.g. If your installation directory is not version-specific, e.g.,
<filename>/usr/local/pgsql</filename>, it is necessary to move the current PostgreSQL install <filename>/usr/local/pgsql</filename>, it is necessary to move the current PostgreSQL install
directory so it does not interfere with the new <productname>PostgreSQL</productname> installation. directory so it does not interfere with the new <productname>PostgreSQL</productname> installation.
Once the current <productname>PostgreSQL</productname> server is shut down, it is safe to rename the Once the current <productname>PostgreSQL</productname> server is shut down, it is safe to rename the
@ -273,9 +273,9 @@ make prefix=/usr/local/pgsql.new install
<para> <para>
Install any custom shared object files (or DLLs) used by the old cluster Install any custom shared object files (or DLLs) used by the old cluster
into the new cluster, e.g. <filename>pgcrypto.so</filename>, into the new cluster, e.g., <filename>pgcrypto.so</filename>,
whether they are from <filename>contrib</filename> whether they are from <filename>contrib</filename>
or some other source. Do not install the schema definitions, e.g. or some other source. Do not install the schema definitions, e.g.,
<command>CREATE EXTENSION pgcrypto</command>, because these will be upgraded <command>CREATE EXTENSION pgcrypto</command>, because these will be upgraded
from the old cluster. from the old cluster.
Also, any custom full text search files (dictionary, synonym, Also, any custom full text search files (dictionary, synonym,
@ -481,7 +481,7 @@ pg_upgrade.exe
<para> <para>
Save any configuration files from the old standbys' configuration Save any configuration files from the old standbys' configuration
directories you need to keep, e.g. <filename>postgresql.conf</filename> directories you need to keep, e.g., <filename>postgresql.conf</filename>
(and any files included by it), <filename>postgresql.auto.conf</filename>, (and any files included by it), <filename>postgresql.auto.conf</filename>,
<literal>recovery.conf</literal>, <literal>pg_hba.conf</literal>, <literal>recovery.conf</literal>, <literal>pg_hba.conf</literal>,
because these will be overwritten or removed in the next step. because these will be overwritten or removed in the next step.
@ -508,7 +508,7 @@ rsync --archive --delete --hard-links --size-only --no-inc-recursive old_cluster
on the standby. The directory structure under the specified on the standby. The directory structure under the specified
directories on the primary and standbys must match. Consult the directories on the primary and standbys must match. Consult the
<application>rsync</application> manual page for details on specifying the <application>rsync</application> manual page for details on specifying the
remote directory, e.g. remote directory, e.g.,
<programlisting> <programlisting>
rsync --archive --delete --hard-links --size-only --no-inc-recursive /opt/PostgreSQL/9.5 \ rsync --archive --delete --hard-links --size-only --no-inc-recursive /opt/PostgreSQL/9.5 \
@ -634,7 +634,7 @@ psql --username=postgres --file=script.sql postgres
<command>pg_upgrade</command> completes. (Automatic deletion is not <command>pg_upgrade</command> completes. (Automatic deletion is not
possible if you have user-defined tablespaces inside the old data possible if you have user-defined tablespaces inside the old data
directory.) You can also delete the old installation directories directory.) You can also delete the old installation directories
(e.g. <filename>bin</filename>, <filename>share</filename>). (e.g., <filename>bin</filename>, <filename>share</filename>).
</para> </para>
</step> </step>
@ -734,7 +734,7 @@ psql --username=postgres --file=script.sql postgres
If you are upgrading a pre-<productname>PostgreSQL</productname> 9.2 cluster If you are upgrading a pre-<productname>PostgreSQL</productname> 9.2 cluster
that uses a configuration-file-only directory, you must pass the that uses a configuration-file-only directory, you must pass the
real data directory location to <application>pg_upgrade</application>, and real data directory location to <application>pg_upgrade</application>, and
pass the configuration directory location to the server, e.g. pass the configuration directory location to the server, e.g.,
<literal>-d /real-data-directory -o '-D /configuration-directory'</literal>. <literal>-d /real-data-directory -o '-D /configuration-directory'</literal>.
</para> </para>
@ -755,7 +755,7 @@ psql --username=postgres --file=script.sql postgres
copy with any changes to make it consistent. (<option>--checksum</option> copy with any changes to make it consistent. (<option>--checksum</option>
is necessary because <command>rsync</command> only has file modification-time is necessary because <command>rsync</command> only has file modification-time
granularity of one second.) You might want to exclude some granularity of one second.) You might want to exclude some
files, e.g. <filename>postmaster.pid</filename>, as documented in <xref files, e.g., <filename>postmaster.pid</filename>, as documented in <xref
linkend="backup-lowlevel-base-backup"/>. If your file system supports linkend="backup-lowlevel-base-backup"/>. If your file system supports
file system snapshots or copy-on-write file copies, you can use that file system snapshots or copy-on-write file copies, you can use that
to make a backup of the old cluster and tablespaces, though the snapshot to make a backup of the old cluster and tablespaces, though the snapshot

2
doc/src/sgml/ref/postgres-ref.sgml
View File

@ -822,7 +822,7 @@ PostgreSQL documentation
<para> <para>
To start <command>postgres</command> with a specific To start <command>postgres</command> with a specific
port, e.g. 1234: port, e.g., 1234:
<screen> <screen>
<prompt>$</prompt> <userinput>postgres -p 1234</userinput> <prompt>$</prompt> <userinput>postgres -p 1234</userinput>
</screen> </screen>

4
doc/src/sgml/ref/prepare.sgml
View File

@ -73,7 +73,7 @@ PREPARE <replaceable class="parameter">name</replaceable> [ ( <replaceable class
Prepared statements potentially have the largest performance advantage Prepared statements potentially have the largest performance advantage
when a single session is being used to execute a large number of similar when a single session is being used to execute a large number of similar
statements. The performance difference will be particularly statements. The performance difference will be particularly
significant if the statements are complex to plan or rewrite, e.g. significant if the statements are complex to plan or rewrite, e.g.,
if the query involves a join of many tables or requires if the query involves a join of many tables or requires
the application of several rules. If the statement is relatively simple the application of several rules. If the statement is relatively simple
to plan and rewrite but relatively expensive to execute, the to plan and rewrite but relatively expensive to execute, the
@ -154,7 +154,7 @@ PREPARE <replaceable class="parameter">name</replaceable> [ ( <replaceable class
<para> <para>
To examine the query plan <productname>PostgreSQL</productname> is using To examine the query plan <productname>PostgreSQL</productname> is using
for a prepared statement, use <xref linkend="sql-explain"/>, e.g. for a prepared statement, use <xref linkend="sql-explain"/>, e.g.,
<command>EXPLAIN EXECUTE</command>. <command>EXPLAIN EXECUTE</command>.
If a generic plan is in use, it will contain parameter symbols If a generic plan is in use, it will contain parameter symbols
<literal>$<replaceable>n</replaceable></literal>, while a custom plan will have the <literal>$<replaceable>n</replaceable></literal>, while a custom plan will have the

6
doc/src/sgml/ref/psql-ref.sgml
View File

@ -626,7 +626,7 @@ EOF
<para> <para>
<application>psql</application> returns 0 to the shell if it <application>psql</application> returns 0 to the shell if it
finished normally, 1 if a fatal error of its own occurs (e.g. out of memory, finished normally, 1 if a fatal error of its own occurs (e.g., out of memory,
file not found), 2 if the connection to the server went bad file not found), 2 if the connection to the server went bad
and the session was not interactive, and 3 if an error occurred in a and the session was not interactive, and 3 if an error occurred in a
script and the variable <varname>ON_ERROR_STOP</varname> was set. script and the variable <varname>ON_ERROR_STOP</varname> was set.
@ -2794,7 +2794,7 @@ lo_import 152801
In <literal>latex-longtable</literal> format, this controls In <literal>latex-longtable</literal> format, this controls
the proportional width of each column containing a left-aligned the proportional width of each column containing a left-aligned
data type. It is specified as a whitespace-separated list of values, data type. It is specified as a whitespace-separated list of values,
e.g. <literal>'0.2 0.2 0.6'</literal>. Unspecified output columns e.g., <literal>'0.2 0.2 0.6'</literal>. Unspecified output columns
use the last specified value. use the last specified value.
</para> </para>
</listitem> </listitem>
@ -4220,7 +4220,7 @@ testdb=&gt; \set PROMPT1 '%[%033[1;33;40m%]%n@%/%R%[%033[0m%]%# '
<application>psql</application> starts up. Tab-completion is also <application>psql</application> starts up. Tab-completion is also
supported, although the completion logic makes no claim to be an supported, although the completion logic makes no claim to be an
<acronym>SQL</acronym> parser. The queries generated by tab-completion <acronym>SQL</acronym> parser. The queries generated by tab-completion
can also interfere with other SQL commands, e.g. <literal>SET can also interfere with other SQL commands, e.g., <literal>SET
TRANSACTION ISOLATION LEVEL</literal>. TRANSACTION ISOLATION LEVEL</literal>.
If for some reason you do not like the tab completion, you If for some reason you do not like the tab completion, you
can turn it off by putting this in a file named can turn it off by putting this in a file named

8
doc/src/sgml/release-11.sgml
View File

@ -10402,7 +10402,7 @@ same commits as above
--> -->
<para> <para>
Allow single-evaluation queries, e.g. <literal>WHERE</literal> Allow single-evaluation queries, e.g., <literal>WHERE</literal>
clause aggregate queries, and functions in the target list to be clause aggregate queries, and functions in the target list to be
parallelized (Amit Kapila, Robert Haas) parallelized (Amit Kapila, Robert Haas)
</para> </para>
@ -11039,7 +11039,7 @@ same commits as above
<para> <para>
<productname>PostgreSQL</productname> only allows superusers to <productname>PostgreSQL</productname> only allows superusers to
access <filename>postgres_fdw</filename> tables without access <filename>postgres_fdw</filename> tables without
passwords, e.g. via <literal>peer</literal>. Previously, the passwords, e.g., via <literal>peer</literal>. Previously, the
session owner had to be a superuser to allow such access; now session owner had to be a superuser to allow such access; now
the view owner is checked instead. the view owner is checked instead.
</para> </para>
@ -11636,7 +11636,7 @@ same commits as above
--> -->
<para> <para>
Allow PL/pgSQL to handle changes to composite types (e.g. record, Allow PL/pgSQL to handle changes to composite types (e.g., record,
row) that happen between the first and later function executions row) that happen between the first and later function executions
in the same session (Tom Lane) in the same session (Tom Lane)
</para> </para>
@ -12375,7 +12375,7 @@ same commits as above
<acronym>SCRAM</acronym> cannot prevent them unless it can be forced <acronym>SCRAM</acronym> cannot prevent them unless it can be forced
to be active. Unfortunately, there is no way to do that in libpq. to be active. Unfortunately, there is no way to do that in libpq.
Support for it is expected in future versions of libpq and in Support for it is expected in future versions of libpq and in
interfaces not built using libpq, e.g. JDBC. interfaces not built using libpq, e.g., JDBC.
</para> </para>
</listitem> </listitem>

6
doc/src/sgml/replication-origins.sgml
View File

@ -31,7 +31,7 @@
which is what should be used to refer to the origin across systems, is which is what should be used to refer to the origin across systems, is
free-form <type>text</type>. It should be used in a way that makes conflicts free-form <type>text</type>. It should be used in a way that makes conflicts
between replication origins created by different replication solutions between replication origins created by different replication solutions
unlikely; e.g. by prefixing the replication solution's name to it. unlikely; e.g., by prefixing the replication solution's name to it.
The OID is used only to avoid having to store the long version The OID is used only to avoid having to store the long version
in situations where space efficiency is important. It should never be shared in situations where space efficiency is important. It should never be shared
across systems. across systems.
@ -68,7 +68,7 @@
manner. Replay progress for all replication origins can be seen in the manner. Replay progress for all replication origins can be seen in the
<link linkend="view-pg-replication-origin-status"> <link linkend="view-pg-replication-origin-status">
<structname>pg_replication_origin_status</structname> <structname>pg_replication_origin_status</structname>
</link> view. An individual origin's progress, e.g. when resuming </link> view. An individual origin's progress, e.g., when resuming
replication, can be acquired using replication, can be acquired using
<link linkend="pg-replication-origin-progress"><function>pg_replication_origin_progress()</function></link> <link linkend="pg-replication-origin-progress"><function>pg_replication_origin_progress()</function></link>
for any origin or for any origin or
@ -86,7 +86,7 @@
output plugin callbacks (see <xref linkend="logicaldecoding-output-plugin"/>) output plugin callbacks (see <xref linkend="logicaldecoding-output-plugin"/>)
generated by the session is tagged with the replication origin of the generated by the session is tagged with the replication origin of the
generating session. This allows treating them differently in the output generating session. This allows treating them differently in the output
plugin, e.g. ignoring all but locally-originating rows. Additionally plugin, e.g., ignoring all but locally-originating rows. Additionally
the <link linkend="logicaldecoding-output-plugin-filter-origin"> the <link linkend="logicaldecoding-output-plugin-filter-origin">
<function>filter_by_origin_cb</function></link> callback can be used <function>filter_by_origin_cb</function></link> callback can be used
to filter the logical decoding change stream based on the to filter the logical decoding change stream based on the

2
doc/src/sgml/runtime.sgml
View File

@ -1960,7 +1960,7 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
be migrated in-place from one major <productname>PostgreSQL</productname> be migrated in-place from one major <productname>PostgreSQL</productname>
version to another. Upgrades can be performed in minutes, version to another. Upgrades can be performed in minutes,
particularly with <option>--link</option> mode. It requires steps similar to particularly with <option>--link</option> mode. It requires steps similar to
<application>pg_dumpall</application> above, e.g. starting/stopping the server, <application>pg_dumpall</application> above, e.g., starting/stopping the server,
running <application>initdb</application>. The <application>pg_upgrade</application> <link running <application>initdb</application>. The <application>pg_upgrade</application> <link
linkend="pgupgrade">documentation</link> outlines the necessary steps. linkend="pgupgrade">documentation</link> outlines the necessary steps.
</para> </para>

2
doc/src/sgml/sepgsql.sgml
View File

@ -527,7 +527,7 @@ UPDATE t1 SET x = 2, y = func1(y) WHERE z = 100;
commands. <productname>SELinux</productname> provides a feature to allow trusted commands. <productname>SELinux</productname> provides a feature to allow trusted
code to run using a security label different from that of the client, code to run using a security label different from that of the client,
generally for the purpose of providing highly controlled access to generally for the purpose of providing highly controlled access to
sensitive data (e.g. rows might be omitted, or the precision of stored sensitive data (e.g., rows might be omitted, or the precision of stored
values might be reduced). Whether or not a function acts as a trusted values might be reduced). Whether or not a function acts as a trusted
procedure is controlled by its security label and the operating system procedure is controlled by its security label and the operating system
security policy. For example: security policy. For example:

4
doc/src/sgml/sources.sgml
View File

@ -888,7 +888,7 @@ BETTER: unrecognized node type: 42
<para> <para>
Both, macros with arguments and <literal>static inline</literal> Both, macros with arguments and <literal>static inline</literal>
functions, may be used. The latter are preferable if there are functions, may be used. The latter are preferable if there are
multiple-evaluation hazards when written as a macro, as e.g. the multiple-evaluation hazards when written as a macro, as e.g., the
case with case with
<programlisting> <programlisting>
#define Max(x, y) ((x) > (y) ? (x) : (y)) #define Max(x, y) ((x) > (y) ? (x) : (y))
@ -899,7 +899,7 @@ BETTER: unrecognized node type: 42
</para> </para>
<para> <para>
When the definition of an inline function references symbols When the definition of an inline function references symbols
(i.e. variables, functions) that are only available as part of the (i.e., variables, functions) that are only available as part of the
backend, the function may not be visible when included from frontend backend, the function may not be visible when included from frontend
code. code.
<programlisting> <programlisting>

4
doc/src/sgml/sslinfo.sgml
View File

@ -47,7 +47,7 @@
</term> </term>
<listitem> <listitem>
<para> <para>
Returns the name of the protocol used for the SSL connection (e.g. TLSv1.0 Returns the name of the protocol used for the SSL connection (e.g., TLSv1.0
TLSv1.1, or TLSv1.2). TLSv1.1, or TLSv1.2).
</para> </para>
</listitem> </listitem>
@ -63,7 +63,7 @@
<listitem> <listitem>
<para> <para>
Returns the name of the cipher used for the SSL connection Returns the name of the cipher used for the SSL connection
(e.g. DHE-RSA-AES256-SHA). (e.g., DHE-RSA-AES256-SHA).
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>

2
doc/src/sgml/textsearch.sgml
View File

@ -3705,7 +3705,7 @@ SELECT plainto_tsquery('supernovae stars');
allows the implementation of very fast searches with online update. allows the implementation of very fast searches with online update.
Partitioning can be done at the database level using table inheritance, Partitioning can be done at the database level using table inheritance,
or by distributing documents over or by distributing documents over
servers and collecting external search results, e.g. via <link servers and collecting external search results, e.g., via <link
linkend="ddl-foreign-data">Foreign Data</link> access. linkend="ddl-foreign-data">Foreign Data</link> access.
The latter is possible because ranking functions use The latter is possible because ranking functions use
only local information. only local information.

2
doc/src/sgml/wal.sgml
View File

@ -266,7 +266,7 @@
overhead can reduce performance, especially if journaling overhead can reduce performance, especially if journaling
causes file system <emphasis>data</emphasis> to be flushed causes file system <emphasis>data</emphasis> to be flushed
to disk. Fortunately, data flushing during journaling can to disk. Fortunately, data flushing during journaling can
often be disabled with a file system mount option, e.g. often be disabled with a file system mount option, e.g.,
<literal>data=writeback</literal> on a Linux ext3 file system. <literal>data=writeback</literal> on a Linux ext3 file system.
Journaled file systems do improve boot speed after a crash. Journaled file systems do improve boot speed after a crash.
</para> </para>

6
doc/src/sgml/xfunc.sgml
View File

@ -152,9 +152,9 @@
Besides <command>SELECT</command> queries, the commands can include data Besides <command>SELECT</command> queries, the commands can include data
modification queries (<command>INSERT</command>, modification queries (<command>INSERT</command>,
<command>UPDATE</command>, and <command>DELETE</command>), as well as <command>UPDATE</command>, and <command>DELETE</command>), as well as
other SQL commands. (You cannot use transaction control commands, e.g. other SQL commands. (You cannot use transaction control commands, e.g.,
<command>COMMIT</command>, <command>SAVEPOINT</command>, and some utility <command>COMMIT</command>, <command>SAVEPOINT</command>, and some utility
commands, e.g. <literal>VACUUM</literal>, in <acronym>SQL</acronym> functions.) commands, e.g., <literal>VACUUM</literal>, in <acronym>SQL</acronym> functions.)
However, the final command However, the final command
must be a <command>SELECT</command> or have a <literal>RETURNING</literal> must be a <command>SELECT</command> or have a <literal>RETURNING</literal>
clause that returns whatever is clause that returns whatever is
@ -3421,7 +3421,7 @@ if (!ptr)
exceptions. Any exceptions must be caught and appropriate errors exceptions. Any exceptions must be caught and appropriate errors
passed back to the C interface. If possible, compile C++ with passed back to the C interface. If possible, compile C++ with
<option>-fno-exceptions</option> to eliminate exceptions entirely; in such <option>-fno-exceptions</option> to eliminate exceptions entirely; in such
cases, you must check for failures in your C++ code, e.g. check for cases, you must check for failures in your C++ code, e.g., check for
NULL returned by <function>new()</function>. NULL returned by <function>new()</function>.
</para> </para>
</listitem> </listitem>

2
doc/src/sgml/xml2.sgml
View File

@ -327,7 +327,7 @@ AS t(article_id integer, author text, page_count integer, title text);
The calling <command>SELECT</command> statement doesn't necessarily have to be The calling <command>SELECT</command> statement doesn't necessarily have to be
just <literal>SELECT *</literal> &mdash; it can reference the output just <literal>SELECT *</literal> &mdash; it can reference the output
columns by name or join them to other tables. The function produces a 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. virtual table with which you can perform any operation you wish (e.g.,
aggregation, joining, sorting etc). So we could also have: aggregation, joining, sorting etc). So we could also have:
<programlisting> <programlisting>
SELECT t.title, p.fullname, p.email SELECT t.title, p.fullname, p.email