summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fd9451d)
raw | patch | inline | side by side (parent: fd9451d)
| author | Bruce Momjian <bruce@momjian.us> | |
| Mon, 31 Aug 2020 22:33:36 +0000 (18:33 -0400) | ||
| committer | Bruce Momjian <bruce@momjian.us> | |
| Mon, 31 Aug 2020 22:33:36 +0000 (18:33 -0400) |
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
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
39 files changed:
index 09f08886c6350742ae1dfa3aedf6f61e0157e3e0..10aa7b1756206e5f02883553aa1163d36442f6e1 100644 (file)
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
start with the <literal>.</literal> character are also ignored, to
prevent mistakes since such files are hidden on some platforms. Multiple
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).
</para>
<para>
With this parameter enabled, you can still create ordinary global
users. Simply append <literal>@</> when specifying the user
- name in the client, e.g. <literal>joe@</>. The <literal>@</>
+ name in the client, e.g., <literal>joe@</>. The <literal>@</>
will be stripped off before the user name is looked up by the
server.
</para>
disabled, but the server continues to accumulate WAL segment files in
the expectation that a command will soon be provided. Setting
<varname>archive_command</> to a command that does nothing but
- return true, e.g. <literal>/bin/true</> (<literal>REM</> on
+ return true, e.g., <literal>/bin/true</> (<literal>REM</> on
Windows), effectively disables
archiving, but also breaks the chain of WAL files needed for
archive recovery, so it should only be used in unusual circumstances.
if your data is likely to be completely in cache, such as when
the database is smaller than the total server memory, decreasing
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,
e.g., <literal>1.1</literal>.
</para>
rows that can be locked; that value is unlimited. The default,
64, has historically proven sufficient, but you might need to
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.
</para>
with assertions enabled. That is the case if the
macro <symbol>USE_ASSERT_CHECKING</symbol> is defined
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
default <productname>PostgreSQL</productname> is built without
assertions.
diff --git a/doc/src/sgml/cube.sgml b/doc/src/sgml/cube.sgml
index 81710cdec1c796a372c84d1349aa9d2c91d33f77..937af6084f474b3b7fc68ca96c79ec204bc9046d 100644 (file)
--- a/doc/src/sgml/cube.sgml
+++ b/doc/src/sgml/cube.sgml
</literal></entry>
<entry>Makes a new cube from an existing cube, using a list of
dimension indexes from an array. Can be used to find both the LL and UR
- coordinates of a single dimension, e.g.
+ coordinates of a single dimension, e.g.,
<literal>cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[2]) = '(3),(7)'</>.
- Or can be used to drop dimensions, or reorder them as desired, e.g.
+ Or can be used to drop dimensions, or reorder them as desired, e.g.,
<literal>cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[3,2,1,1]) = '(5, 3,
1, 1),(8, 7, 6, 6)'</>.
</entry>
index 72ffc4bc60ac053892c0d85fe63bd215d7f58d50..9f3fadd64145f0e3326d2ec1761e2d2bb564f6c5 100644 (file)
very large number of digits. It is especially recommended for
storing monetary amounts and other quantities where exactness is
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
compared to the integer types, or to the floating-point types
described in the next section.
diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index f508ddee1ad6de4a8bf7994975fcf0f6a90141bc..83102d9d164635604b64161f35119131d55c55b2 100644 (file)
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
<para>
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
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
index e0ae262b8a556bad2c1af6e346d5a49a2d89db65..7db342bd47bc8a22366dc8f2907914731f398164 100644 (file)
<para>
Occasionally text is too wide for the printed margins, and in
- extreme cases, too wide for the printed page, e.g. non-wrapped
+ extreme cases, too wide for the printed page, e.g., non-wrapped
text, wide tables. Overly wide text generates <quote>Overfull
- hbox</quote> messages in the TeX log output file, e.g.
+ hbox</quote> messages in the TeX log output file, e.g.,
<filename>postgres-US.log</> or <filename>postgres-A4.log</>.
There are 72 points in an inch so anything reported as over 72
points too wide will probably not fit on the printed page (assuming
one inch margins). To find the <acronym>SGML</acronym> text
causing the overflow, find the first page number mentioned above
- the overflow message, e.g. <literal>[50 ###]</> (page 50), and
- look at the page after that (e.g. page 51) in the <acronym>PDF</acronym>
+ the overflow message, e.g., <literal>[50 ###]</> (page 50), and
+ look at the page after that (e.g., page 51) in the <acronym>PDF</acronym>
file to see the overflow text and adjust the <acronym>SGML</acronym>
accordingly.
</para>
diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml
index 0bcdc144be58e9bb2b814ca2e902be0ec1c35106..62b952322827cc2515e544ad5f5f1c0c1cb7e613 100644 (file)
--- a/doc/src/sgml/ecpg.sgml
+++ b/doc/src/sgml/ecpg.sgml
EXEC SQL FETCH NEXT FROM mycursor INTO SQL DESCRIPTOR mydesc;
</programlisting>
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>
<term><literal>sqllen</></term>
<listitem>
<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>
</listitem>
</varlistentry>
<term><literal>FREE cursor_name</></term>
<listitem>
<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)
there is no <literal>FREE cursor_name</> statement in ECPG. This is because in ECPG,
<literal>DECLARE CURSOR</literal> doesn't translate to a function call into
index eb0d55f3e5b56ab599f869cc2971b46eeff96ae2..bb4bd942d4e86f0c1189d06407233d6fbea06f1b 100644 (file)
--- a/doc/src/sgml/extend.sgml
+++ b/doc/src/sgml/extend.sgml
<para>
An extension is <firstterm>relocatable</> if it is possible to move
its contained objects into a different schema after initial creation
- of the extension. The default is <literal>false</>, i.e. the
+ of the extension. The default is <literal>false</>, i.e., the
extension is not relocatable.
See below for more information.
</para>
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 9d34bc0282c34fda12049f31db4989b312fafe40..258c5bed21fc56f9a4e1dc2531b255d56db959b7 100644 (file)
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
will be replaced by the year data, but the single <literal>Y</literal> in <literal>Year</literal>
will not be. In <function>to_date</>, <function>to_number</>,
and <function>to_timestamp</>, double-quoted strings skip the number of
- input characters contained in the string, e.g. <literal>"XX"</>
+ input characters contained in the string, e.g., <literal>"XX"</>
skips two input characters.
</para>
</listitem>
<listitem>
<para>
- 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</>, 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</> becomes 1995.
</para>
</listitem>
<listitem>
<para>
<function>to_char(interval)</function> formats <literal>HH</> and
- <literal>HH12</> as shown on a 12-hour clock, i.e. zero hours
+ <literal>HH12</> as shown on a 12-hour clock, i.e., zero hours
and 36 hours output as <literal>12</>, while <literal>HH24</>
outputs the full hour value, which can exceed 23 for intervals.
</para>
<row>
<entry><literal>objsubid</literal></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>
<entry><literal>command_tag</literal></entry>
<row>
<entry><literal>objsubid</literal></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>
<entry><literal>original</literal></entry>
diff --git a/doc/src/sgml/gin.sgml b/doc/src/sgml/gin.sgml
index 69544bb3972109c7ea0ee52ee31035488e9e88e5..1307113b676df8953656508cdf3e40f6f1b99048 100644 (file)
--- a/doc/src/sgml/gin.sgml
+++ b/doc/src/sgml/gin.sgml
contains the corresponding query keys. Likewise, the function must
return GIN_FALSE only if the item does not match, whether or not it
contains the GIN_MAYBE keys. If the result depends on the GIN_MAYBE
- entries, i.e. the match cannot be confirmed or refuted based on the
+ entries, i.e., the match cannot be confirmed or refuted based on the
known query keys, the function must return GIN_MAYBE.
</para>
<para>
index 8651e192130b857bf4b994c2e80d07c86f6026db..a4e5ed219018d6b41c9ea3355e725434de04740a 100644 (file)
this is unacceptable, either the middleware or the application
must query such values from a single server and then use those
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
standby servers via master-standby replication, not by the replication
middleware. Care must also be taken that all
Set up continuous archiving on the primary to an archive directory
accessible from the standby, as described
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
the master server.
</para>
<itemizedlist>
<listitem>
<para>
- Data Definition Language (DDL) - e.g. <command>CREATE INDEX</>
+ Data Definition Language (DDL) - e.g., <command>CREATE INDEX</>
</para>
</listitem>
<listitem>
<para>
WAL file control commands will not work during recovery,
- e.g. <function>pg_start_backup</>, <function>pg_switch_xlog</> etc.
+ e.g., <function>pg_start_backup</>, <function>pg_switch_xlog</> etc.
</para>
<para>
index ef015d48c9eeb49c63aa256acee96688e171d026..f69ad98c082eb85791a8bbc149b7c03d70d177f1 100644 (file)
Check whether the index can support <firstterm>index-only scans</> on the
given column, by returning the indexed column values for an index entry in
the form of an <structname>IndexTuple</structname>. The attribute number
- is 1-based, i.e. the first columns attno is 1. Returns TRUE if supported,
+ is 1-based, i.e., the first columns attno is 1. Returns TRUE if supported,
else FALSE. If the access method does not support index-only scans at all,
the <structfield>amcanreturn</> field in its <structname>pg_am</> row can
be set to zero.
index 7087fea72f7f1389ac82c49eb5d0171da309512e..05cf2a0cfb6a65c920d4fc14908bc8bdcd6c8085 100644 (file)
In the <productname>Microsoft Windows SDK</productname>, start the
<application>CMD shell</application> listed under the SDK on the Start Menu.
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
with a 32-bit release build. See <command>/?</command> for other options to
<command>setenv</command>. All commands should be run from the
installations <filename>C:\Program Files\GnuWin32</filename>.
Consider installing into <filename>C:\GnuWin32</filename> or use the
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>
</note>
index 2a2cf09ae6feb36bebcc4c1e8111166bd6e945ce..85a9955542b5e464623ca9590166c81ed52c3d92 100644 (file)
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
<term><literal>cipher</literal></term>
<listitem>
<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
to each SSL implementation.
</para>
<function>PQflush</function> again. Repeat until
<function>PQflush</function> returns 0. (It is necessary to check for
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
<function>PQflush</function> returns 0, wait for the socket to be
read-ready and then read the response as described above.
For a connection to be known secure, SSL usage must be configured
on <emphasis>both the client and the server</> before the connection
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
connections can be ensured
by setting the <literal>sslmode</> parameter to <literal>verify-full</> or
index 6f8abfd8efd67804fa40b71040fcc303f30501d1..d5446d080c6e74296f47041607b611d7ffd73c79 100644 (file)
When the server shuts down cleanly, a permanent copy of the statistics
data is stored in the <filename>pg_stat</filename> subdirectory, so that
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.
</para>
diff --git a/doc/src/sgml/mvcc.sgml b/doc/src/sgml/mvcc.sgml
index 2a7c1d01fcb6ead5262862211b8854b12475f87c..58ca668569f291d5408ccfa3ea87267a627cc283 100644 (file)
--- a/doc/src/sgml/mvcc.sgml
+++ b/doc/src/sgml/mvcc.sgml
<para>
In <productname>PostgreSQL</productname>, you can request any of
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
it is the only sensible way to map the standard isolation levels to
PostgreSQL's multiversion concurrency control architecture.
index 9a1c21a54254b047bb0d4f4f59f437e7c537e5d9..9df866442cdd190ceecba02a8b8b013cf28658c4 100644 (file)
<listitem>
<para>
Place the database cluster's data directory in a memory-backed
- file system (i.e. <acronym>RAM</> disk). This eliminates all
+ file system (i.e., <acronym>RAM</> disk). This eliminates all
database disk I/O, but limits data storage to the amount of
available memory (and perhaps swap).
</para>
index a3a4e1593737f2feaa015c0dac15770e89143da1..9f3f108b86d6f918da1594b35cd8394124b4b6d9 100644 (file)
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
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
may respond with a NegotiateProtocolVersion message containing the highest
minor protocol version which it supports. The client may then choose either
by the client, but does support an earlier version of the protocol;
this message indicates the highest supported minor version. This
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
a message indicating the success or failure of authentication.
</para>
If <literal>TIMELINE</literal> option is specified,
streaming starts on timeline <replaceable class="parameter">tli</>;
otherwise, the server's current timeline is selected. The server can
- reply with an error, e.g. if the requested section of WAL has already
+ reply with an error, e.g., if the requested section of WAL has already
been recycled. On success, server responds with a CopyBothResponse
message, and then starts to stream WAL to the frontend.
</para>
<para>
Instructs server to start streaming WAL for logical replication, starting
at WAL position <replaceable class="parameter">XXX/XXX</>. The server can
- reply with an error, e.g. if the requested section of WAL has already
+ reply with an error, e.g., if the requested section of WAL has already
been recycled. On success, server responds with a CopyBothResponse
message, and then starts to stream WAL to the frontend.
</para>
index 5adba0af33fd00fe1d8d95c000ce97656ae8a6dd..013997149ea17054e1c21cde30337f0a6691a048 100644 (file)
( )
)
</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.
</para>
<programlisting>
CUBE ( <replaceable>e1</>, <replaceable>e2</>, ... )
</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
<programlisting>
CUBE ( a, b, c )
index 26af221745cc294fbe13df8795a62856fc92f4a3..0561fa0c18ac5c557a412ce17e30e8562466f2b9 100644 (file)
<listitem>
<para>
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
ended.
</para>
index 7ae16df0e877b25c2205af551b33834b50cb8233..9f69601f343ca4e8625a06d23dd7ce8577b272ba 100644 (file)
<listitem>
<para>
Collation order (<literal>LC_COLLATE</>) 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.
The default is to use the collation order of the template database.
See below for additional restrictions.
<listitem>
<para>
Character classification (<literal>LC_CTYPE</>) 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
the template database. See below for additional restrictions.
</para>
diff --git a/doc/src/sgml/ref/create_event_trigger.sgml b/doc/src/sgml/ref/create_event_trigger.sgml
index be18fc36e8045157a0075206b57c3b5b530caf33..89410e8d141544506a525f073c3c680a365e57f5 100644 (file)
A list of values for the
associated <replaceable class="parameter">filter_variable</replaceable>
for which the trigger should fire. For <literal>TAG</>, this means a
- list of command tags (e.g. <literal>'DROP FUNCTION'</>).
+ list of command tags (e.g., <literal>'DROP FUNCTION'</>).
</para>
</listitem>
</varlistentry>
index e0743696e1760dfedf8034b87342e8a55054d07e..864e53b0d828eaa2e9f6858d83cdf09f900f54d1 100644 (file)
The name of the language that the function is implemented in.
It can be <literal>sql</literal>, <literal>c</literal>,
<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.
</para>
</listitem>
index ced047a3997824ba86b2e1341f9973d126590339..eb3af11a0bd4a428cd189a057198cac223a7c0de 100644 (file)
@@ -353,7 +353,7 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
schema (assuming that the objects' own privilege requirements are
also met). Essentially this allows the grantee to <quote>look up</>
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
statements that have previously performed this lookup, so this is not
a completely secure way to prevent object access.
index 4e339ecce85b36d6afcd19b095b3e5002d0480f3..ccaefd2082de843c17f98941a0e9e6a556947f64 100644 (file)
<command>initdb</command> initializes the database cluster's default
locale and character set encoding. The character set encoding,
collation order (<literal>LC_COLLATE</>) and character set classes
- (<literal>LC_CTYPE</>, e.g. upper, lower, digit) can be set separately
+ (<literal>LC_CTYPE</>, e.g., upper, lower, digit) can be set separately
for a database when it is created. <command>initdb</command> determines
those settings for the <literal>template1</literal> database, which will
serve as the default for all other databases.
index 13a374e6eda13739decb6359238bbbe8e642a325..221160179ca0ca220ed65266748118131cb6c231 100644 (file)
<term><option>--if-exists</option></term>
<listitem>
<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
unless <option>--clean</> is also specified.
</para>
index 806e9694d5cfea591274cbf998dfd1bad358a01d..10c74427b17ae49b3f441b7147d443075391a29f 100644 (file)
<term><option>--if-exists</option></term>
<listitem>
<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 clean databases and other objects. This option is not valid
unless <option>--clean</> is also specified.
</para>
index a61f9f331e546c0eaf7ed2b12c2c02f58cd37d16..7fa86b785870ce4b5eac50fdb5293a2efd0f805d 100644 (file)
<term><option>--if-exists</option></term>
<listitem>
<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
unless <option>--clean</> is also specified.
</para>
index 5df3bd0ee26acf2e1adf6eaf619b69710535a9c5..47e62eb9cb2da0aee8eedec61f4c52af0ff93584 100644 (file)
transaction to finish. The wait time is called the schedule lag time,
and its average and maximum are also reported separately. The
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
latency.
</para>
<para>
Remember to take the sampling rate into account when processing the
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).
</para>
</listitem>
<literal>2.0 / parameter</>, that is a relative
<literal>1.0 / parameter</> around the mean; for instance, if
<replaceable>parameter</> 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</> to <literal>5.0 / 8.0</>) and 95% from
the middle half (<literal>2.0 / 4.0</>) of the interval (second and
third quartiles). The minimum <replaceable>parameter</> is 2.0 for
option is used. The very last one, <replaceable>skipped_transactions</>,
is only present if the option <option>--latency-limit</> is present, too.
They are calculated from 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.
</para>
index fc5cc8d4a25a7a8b496bbc73a3516a2d592f626d..71ff99fd0548d36a832183ee77ebed39adc04c35 100644 (file)
<application>pg_upgrade</> (formerly called <application>pg_migrator</>) allows data
stored in <productname>PostgreSQL</> data files to be upgraded to a later <productname>PostgreSQL</>
major version without the data dump/reload typically required for
- major version upgrades, e.g. from 8.4.7 to the current major release
- of <productname>PostgreSQL</>. It is not required for minor version upgrades, e.g. from
+ major version upgrades, e.g., from 8.4.7 to the current major release
+ of <productname>PostgreSQL</>. It is not required for minor version upgrades, e.g., from
9.0.1 to 9.0.4.
</para>
<para>
<application>pg_upgrade</> 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
binaries. It is important that
any external modules are also binary compatible, though this cannot
<title>Optionally move the old cluster</title>
<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/9.1</>, you do not need to move the old cluster. The
graphical installers all use version-specific installation directories.
</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</>, it is necessary to move the current PostgreSQL install
directory so it does not interfere with the new <productname>PostgreSQL</> installation.
Once the current <productname>PostgreSQL</> server is shut down, it is safe to rename the
<para>
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>
- 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</>, because these will be upgraded
from the old cluster.
Also, any custom full text search files (dictionary, synonym,
<para>
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>,
<literal>recovery.conf</literal>, <literal>pg_hba.conf</literal>,
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
directories on the primary and standbys must match. Consult the
<application>rsync</> manual page for details on specifying the
- remote directory, e.g.
+ remote directory, e.g.,
<programlisting>
rsync --archive --delete --hard-links --size-only --no-inc-recursive /opt/PostgreSQL/9.5 \
<command>pg_upgrade</command> completes. (Automatic deletion is not
possible if you have user-defined tablespaces inside the old data
directory.) You can also delete the old installation directories
- (e.g. <filename>bin</>, <filename>share</>).
+ (e.g., <filename>bin</>, <filename>share</>).
</para>
</step>
If you are upgrading a pre-<productname>PostgreSQL</> 9.2 cluster
that uses a configuration-file-only directory, you must pass the
real data directory location to <application>pg_upgrade</>, 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'</>.
</para>
copy with any changes to make it consistent. (<option>--checksum</>
is necessary because <command>rsync</> only has file modification-time
granularity of one second.) You might want to exclude some
- files, e.g. <filename>postmaster.pid</>, as documented in <xref
+ files, e.g., <filename>postmaster.pid</>, as documented in <xref
linkend="backup-lowlevel-base-backup">. If your file system supports
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
index 44d7f382d20b4a0ea8f157b3c33c53b2e77e95f9..20e406321881bc24fcdd80a946453a7494021ffb 100644 (file)
<para>
To start <command>postgres</command> with a specific
- port, e.g. 1234:
+ port, e.g., 1234:
<screen>
<prompt>$</prompt> <userinput>postgres -p 1234</userinput>
</screen>
index c35e2ca6d4d37267277e4ae0666dc7829f2ffd81..7d24932933c882faa2b41f221fdd6d298c6cec82 100644 (file)
<para>
<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
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.
In <literal>latex-longtable</literal> format, this controls
the proportional width of each column containing a left-aligned
data type. It is specified as a whitespace-separated list of values,
- e.g. <literal>'0.2 0.2 0.6'</>. Unspecified output columns
+ e.g., <literal>'0.2 0.2 0.6'</>. Unspecified output columns
use the last specified value.
</para>
</listitem>
<application>psql</application> starts up. Tab-completion is also
supported, although the completion logic makes no claim to be an
<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</>.
If for some reason you do not like the tab completion, you
can turn it off by putting this in a file named
index a3e8a5ac5fc6badad67684ba08d19066b69df1eb..0267f1ef0b1848aa1a4a7f66b255876d4b61884e 100644 (file)
<listitem>
<para>
Fix logical decoding to handle cases where a mapped catalog table is
- repeatedly rewritten, e.g. by <literal>VACUUM FULL</literal>
+ repeatedly rewritten, e.g., by <literal>VACUUM FULL</literal>
(Andres Freund)
</para>
</listitem>
</para>
<para>
- By default, replication commands, e.g. <link
+ By default, replication commands, e.g., <link
linkend="protocol-replication"><literal>IDENTIFY_SYSTEM</></>,
are not logged, even when <xref linkend="guc-log-statement"> is set
to <literal>all</>.
<para>
Allow <filename>recovery.conf</>'s <link
linkend="primary-conninfo"><varname>primary_conninfo</></> setting to
- use connection <acronym>URI</>s, e.g. <literal>postgres://</>
+ use connection <acronym>URI</>s, e.g., <literal>postgres://</>
(Alexander Shulgin)
</para>
</listitem>
index 317ca9a1dfbf3d175c9f855d41ec012eeb87d9f8..0883ca06d0557c20ae0df239269c47199e5a17ba 100644 (file)
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
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
in situations where space efficiency is important. It should never be shared
across systems.
manner. Replay progress for all replication origins can be seen in the
<link linkend="view-pg-replication-origin-status">
<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
<link linkend="pg-replication-origin-progress"><function>pg_replication_origin_progress()</function></link>
for any origin or
output plugin callbacks (see <xref linkend="logicaldecoding-output-plugin">)
generated by the session is tagged with the replication origin of the
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">
<function>filter_by_origin_cb</function></link> callback can be used
to filter the logical decoding change stream based on the
index 6403e37e6aece1b98f9dff8fc6a7474aa3ee3b3c..1bc3f169b738b301d2423b07736d7252b6b64660 100644 (file)
be migrated in-place from one major <productname>PostgreSQL</>
version to another. Upgrades can be performed in minutes,
particularly with <option>--link</> mode. It requires steps similar to
- <application>pg_dumpall</> above, e.g. starting/stopping the server,
+ <application>pg_dumpall</> above, e.g., starting/stopping the server,
running <application>initdb</>. The <application>pg_upgrade</> <link
linkend="pgupgrade">documentation</> outlines the necessary steps.
</para>
index 545519610124e546dda0d746bef4cb9ae4ee5bdc..b23515c453eeb9b5f01abda601ddf07867d92582 100644 (file)
commands. <productname>SELinux</> provides a feature to allow trusted
code to run using a security label different from that of the client,
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
procedure is controlled by its security label and the operating system
security policy. For example:
index 9dfd24fd29cc12e31d1d3476b2a32a5e43548010..f99981350440f8812ab706abcf69d0bdf4cae990 100644 (file)
</term>
<listitem>
<para>
- Returns the name of the protocol used for the SSL connection (e.g. SSLv2,
+ Returns the name of the protocol used for the SSL connection (e.g., SSLv2,
SSLv3, or TLSv1).
</para>
</listitem>
<listitem>
<para>
Returns the name of the cipher used for the SSL connection
- (e.g. DHE-RSA-AES256-SHA).
+ (e.g., DHE-RSA-AES256-SHA).
</para>
</listitem>
</varlistentry>
diff --git a/doc/src/sgml/wal.sgml b/doc/src/sgml/wal.sgml
index f0a95e6db13a26a6ead5114a4054260ced0039f1..67fdbf3c8e91075ae124b930224458213c9c81ba 100644 (file)
--- a/doc/src/sgml/wal.sgml
+++ b/doc/src/sgml/wal.sgml
overhead can reduce performance, especially if journaling
causes file system <emphasis>data</emphasis> to be flushed
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</> on a Linux ext3 file system.
Journaled file systems do improve boot speed after a crash.
</para>
index 31093e4904d25a6e24dedb36bd9cf8454827dfef..610c09ac265f0acbfc5730275d6936e2f377daf3 100644 (file)
--- a/doc/src/sgml/xfunc.sgml
+++ b/doc/src/sgml/xfunc.sgml
Besides <command>SELECT</command> queries, the commands can include data
modification queries (<command>INSERT</command>,
<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>SAVEPOINT</>, and some utility
- commands, e.g. <literal>VACUUM</>, in <acronym>SQL</acronym> functions.)
+ commands, e.g., <literal>VACUUM</>, in <acronym>SQL</acronym> functions.)
However, the final command
must be a <command>SELECT</command> or have a <literal>RETURNING</>
clause that returns whatever is
exceptions. Any exceptions must be caught and appropriate errors
passed back to the C interface. If possible, compile C++ with
<option>-fno-exceptions</> 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()</>.
</para>
</listitem>
diff --git a/doc/src/sgml/xml2.sgml b/doc/src/sgml/xml2.sgml
index c32d743730cce3a250e71180ccc02a6de3af64fb..612ff24999567c36410aaff7546d53f674db044b 100644 (file)
--- a/doc/src/sgml/xml2.sgml
+++ b/doc/src/sgml/xml2.sgml
The calling <command>SELECT</> statement doesn't necessarily have be
just <literal>SELECT *</> — it can reference the output
columns by name or join them to other tables. The function produces a
- virtual table with which you can perform any operation you wish (e.g.
+ virtual table with which you can perform any operation you wish (e.g.,
aggregation, joining, sorting etc). So we could also have:
<programlisting>
SELECT t.title, p.fullname, p.email