Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit3fb67ac

Browse files
committed
doc: add commas after 'i.e.' and 'e.g.'
This follows the American format,https://jakubmarian.com/comma-after-i-e-and-e-g/. There is no intentionof requiring this format for future text, but making existing textconsistent every few years makes sense.Discussion:https://postgr.es/m/20200825183619.GA22369@momjian.usBackpatch-through: 9.5
1 parentb1f5281 commit3fb67ac

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+101
-101
lines changed

‎doc/src/sgml/bki.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@
458458
Use of symbolic references is enabled in a particular catalog column
459459
by attaching <literal>BKI_LOOKUP(<replaceable>lookuprule</replaceable>)</literal>
460460
to the column's definition, where <replaceable>lookuprule</replaceable>
461-
is the name of the referenced catalog, e.g. <literal>pg_proc</literal>.
461+
is the name of the referenced catalog, e.g., <literal>pg_proc</literal>.
462462
<literal>BKI_LOOKUP</literal> can be attached to columns of
463463
type <type>Oid</type>, <type>regproc</type>, <type>oidvector</type>,
464464
or <type>Oid[]</type>; in the latter two cases it implies performing a

‎doc/src/sgml/config.sgml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ include_dir 'directory'
424424
start with the <literal>.</literal> character are also ignored, to
425425
prevent mistakes since such files are hidden on some platforms. Multiple
426426
files within an include directory are processed in file name order
427-
(according to C locale rules, i.e. numbers before letters, and
427+
(according to C locale rules, i.e., numbers before letters, and
428428
uppercase letters before lowercase ones).
429429
</para>
430430

@@ -1090,7 +1090,7 @@ include_dir 'conf.d'
10901090
<para>
10911091
With this parameter enabled, you can still create ordinary global
10921092
users. Simply append <literal>@</literal> when specifying the user
1093-
name in the client, e.g. <literal>joe@</literal>. The <literal>@</literal>
1093+
name in the client, e.g., <literal>joe@</literal>. The <literal>@</literal>
10941094
will be stripped off before the user name is looked up by the
10951095
server.
10961096
</para>
@@ -3168,7 +3168,7 @@ include_dir 'conf.d'
31683168
disabled, but the server continues to accumulate WAL segment files in
31693169
the expectation that a command will soon be provided. Setting
31703170
<varname>archive_command</varname> to a command that does nothing but
3171-
return true, e.g. <literal>/bin/true</literal> (<literal>REM</literal> on
3171+
return true, e.g., <literal>/bin/true</literal> (<literal>REM</literal> on
31723172
Windows), effectively disables
31733173
archiving, but also breaks the chain of WAL files needed for
31743174
archive recovery, so it should only be used in unusual circumstances.
@@ -3413,7 +3413,7 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows
34133413
<listitem>
34143414
<para>
34153415
This parameter specifies that recovery should end as soon as a
3416-
consistent state is reached, i.e. as early as possible. When restoring
3416+
consistent state is reached, i.e., as early as possible. When restoring
34173417
from an online backup, this means the point where taking the backup
34183418
ended.
34193419
</para>
@@ -3459,7 +3459,7 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows
34593459
<xref linkend="guc-timezone-abbreviations"/> variable has been set
34603460
earlier in the configuration file). Preferred style is to use a
34613461
numeric offset from UTC, or you can write a full time zone name,
3462-
e.g. <literal>Europe/Helsinki</literal> not <literal>EEST</literal>.
3462+
e.g., <literal>Europe/Helsinki</literal> not <literal>EEST</literal>.
34633463
</para>
34643464
</listitem>
34653465
</varlistentry>
@@ -4766,7 +4766,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
47664766
if your data is likely to be completely in cache, such as when
47674767
the database is smaller than the total server memory, decreasing
47684768
random_page_cost can be appropriate. Storage that has a low random
4769-
read cost relative to sequential, e.g. solid-state drives, might
4769+
read cost relative to sequential, e.g., solid-state drives, might
47704770
also be better modeled with a lower value for random_page_cost,
47714771
e.g., <literal>1.1</literal>.
47724772
</para>
@@ -8651,7 +8651,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
86518651
rows that can be locked; that value is unlimited. The default,
86528652
64, has historically proven sufficient, but you might need to
86538653
raise this value if you have queries that touch many different
8654-
tables in a single transaction, e.g. query of a parent table with
8654+
tables in a single transaction, e.g., query of a parent table with
86558655
many children. This parameter can only be set at server start.
86568656
</para>
86578657

@@ -9147,7 +9147,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
91479147
with assertions enabled. That is the case if the
91489148
macro <symbol>USE_ASSERT_CHECKING</symbol> is defined
91499149
when <productname>PostgreSQL</productname> is built (accomplished
9150-
e.g. by the <command>configure</command> option
9150+
e.g., by the <command>configure</command> option
91519151
<option>--enable-cassert</option>). By
91529152
default <productname>PostgreSQL</productname> is built without
91539153
assertions.

‎doc/src/sgml/datatype.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@
507507
very large number of digits. It is especially recommended for
508508
storing monetary amounts and other quantities where exactness is
509509
required. Calculations with <type>numeric</type> values yield exact
510-
results where possible, e.g. addition, subtraction, multiplication.
510+
results where possible, e.g., addition, subtraction, multiplication.
511511
However, calculations on <type>numeric</type> values are very slow
512512
compared to the integer types, or to the floating-point types
513513
described in the next section.
@@ -4931,7 +4931,7 @@ SELECT * FROM pg_attribute
49314931

49324932
<row>
49334933
<entry><type>unknown</type></entry>
4934-
<entry>Identifies a not-yet-resolved type, e.g. of an undecorated
4934+
<entry>Identifies a not-yet-resolved type, e.g., of an undecorated
49354935
string literal.</entry>
49364936
</row>
49374937

‎doc/src/sgml/ddl.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1338,7 +1338,7 @@ ALTER TABLE products ADD COLUMN description text;
13381338
</para>
13391339

13401340
<para>
1341-
However, if the default value is volatile (e.g.
1341+
However, if the default value is volatile (e.g.,
13421342
<function>clock_timestamp()</function>)
13431343
each row will need to be updated with the value calculated at the time
13441344
<command>ALTER TABLE</command> is executed. To avoid a potentially
@@ -1826,7 +1826,7 @@ REVOKE ALL ON accounts FROM PUBLIC;
18261826
schema (assuming that the objects' own privilege requirements are
18271827
also met). Essentially this allows the grantee to <quote>look up</quote>
18281828
objects within the schema. Without this permission, it is still
1829-
possible to see the object names, e.g. by querying system catalogs.
1829+
possible to see the object names, e.g., by querying system catalogs.
18301830
Also, after revoking this permission, existing sessions might have
18311831
statements that have previously performed this lookup, so this is not
18321832
a completely secure way to prevent object access.

‎doc/src/sgml/ecpg.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3689,7 +3689,7 @@ EXEC SQL DEALLOCATE DESCRIPTOR <replaceable>identifier</replaceable>;
36893689
EXEC SQL FETCH NEXT FROM mycursor INTO SQL DESCRIPTOR mydesc;
36903690
</programlisting>
36913691
If the result set is empty, the Descriptor Area will still contain
3692-
the metadata from the query, i.e. the field names.
3692+
the metadata from the query, i.e., the field names.
36933693
</para>
36943694

36953695
<para>
@@ -4106,7 +4106,7 @@ typedef struct sqlvar_struct sqlvar_t;
41064106
<term><literal>sqllen</literal></term>
41074107
<listitem>
41084108
<para>
4109-
Contains the binary length of the field. e.g. 4 bytes for <type>ECPGt_int</type>.
4109+
Contains the binary length of the field. e.g., 4 bytes for <type>ECPGt_int</type>.
41104110
</para>
41114111
</listitem>
41124112
</varlistentry>
@@ -8044,7 +8044,7 @@ EXEC SQL CLOSE DATABASE;
80448044
<term><literal>FREE cursor_name</literal></term>
80458045
<listitem>
80468046
<para>
8047-
Due to the differences how ECPG works compared to Informix's ESQL/C (i.e. which steps
8047+
Due to the differences how ECPG works compared to Informix's ESQL/C (i.e., which steps
80488048
are purely grammar transformations and which steps rely on the underlying run-time library)
80498049
there is no <literal>FREE cursor_name</literal> statement in ECPG. This is because in ECPG,
80508050
<literal>DECLARE CURSOR</literal> doesn't translate to a function call into

‎doc/src/sgml/extend.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@
573573
<para>
574574
An extension is <firstterm>relocatable</firstterm> if it is possible to move
575575
its contained objects into a different schema after initial creation
576-
of the extension. The default is <literal>false</literal>, i.e. the
576+
of the extension. The default is <literal>false</literal>, i.e., the
577577
extension is not relocatable.
578578
See <xref linkend="extend-extensions-relocation"/> for more information.
579579
</para>
@@ -1466,7 +1466,7 @@ include $(PGXS)
14661466
<term><varname>NO_INSTALLCHECK</varname></term>
14671467
<listitem>
14681468
<para>
1469-
don't define an <literal>installcheck</literal> target, useful e.g. if tests require special configuration, or don't use <application>pg_regress</application>
1469+
don't define an <literal>installcheck</literal> target, useful e.g., if tests require special configuration, or don't use <application>pg_regress</application>
14701470
</para>
14711471
</listitem>
14721472
</varlistentry>

‎doc/src/sgml/func.sgml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6685,9 +6685,9 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
66856685
<listitem>
66866686
<para>
66876687
In <function>to_timestamp</function> and <function>to_date</function>,
6688-
if the year format specification is less than four digits, e.g.
6688+
if the year format specification is less than four digits, e.g.,
66896689
<literal>YYY</literal>, and the supplied year is less than four digits,
6690-
the year will be adjusted to be nearest to the year 2020, e.g.
6690+
the year will be adjusted to be nearest to the year 2020, e.g.,
66916691
<literal>95</literal> becomes 1995.
66926692
</para>
66936693
</listitem>
@@ -10173,7 +10173,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
1017310173
<literal>"string"</literal> (to include all string values), <literal>"numeric"</literal> (to include all numeric values in the string format),
1017410174
<literal>"boolean"</literal> (to include all Boolean values in the string format <literal>"true"</literal>/<literal>"false"</literal>),
1017510175
<literal>"key"</literal> (to include all keys) or <literal>"all"</literal> (to include all above). These values
10176-
can be combined together to include, e.g. all string and numeric values.
10176+
can be combined together to include, e.g., all string and numeric values.
1017710177
</entry>
1017810178
<entry><literal>json_to_tsvector('english', '{"a": "The Fat Rats", "b": 123}'::json, '["string", "numeric"]')</literal></entry>
1017910179
<entry><literal>'123':5 'fat':2 'rat':3</literal></entry>
@@ -22374,7 +22374,7 @@ FOR EACH ROW EXECUTE FUNCTION suppress_redundant_updates_trigger();
2237422374
<row>
2237522375
<entry><literal>objsubid</literal></entry>
2237622376
<entry><type>integer</type></entry>
22377-
<entry>Sub-object ID (e.g. attribute number for a column)</entry>
22377+
<entry>Sub-object ID (e.g., attribute number for a column)</entry>
2237822378
</row>
2237922379
<row>
2238022380
<entry><literal>command_tag</literal></entry>
@@ -22461,7 +22461,7 @@ FOR EACH ROW EXECUTE FUNCTION suppress_redundant_updates_trigger();
2246122461
<row>
2246222462
<entry><literal>objsubid</literal></entry>
2246322463
<entry><type>integer</type></entry>
22464-
<entry>Sub-object ID (e.g. attribute number for a column)</entry>
22464+
<entry>Sub-object ID (e.g., attribute number for a column)</entry>
2246522465
</row>
2246622466
<row>
2246722467
<entry><literal>original</literal></entry>

‎doc/src/sgml/high-availability.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ protocol to make nodes agree on a serializable transactional order.
219219
this is unacceptable, either the middleware or the application
220220
must query such values from a single server and then use those
221221
values in write queries. Another option is to use this replication
222-
option with a traditional master-standby setup, i.e. data modification
222+
option with a traditional master-standby setup, i.e., data modification
223223
queries are sent only to the master and are propagated to the
224224
standby servers via master-standby replication, not by the replication
225225
middleware. Care must also be taken that all
@@ -657,7 +657,7 @@ protocol to make nodes agree on a serializable transactional order.
657657
Set up continuous archiving on the primary to an archive directory
658658
accessible from the standby, as described
659659
in <xref linkend="continuous-archiving"/>. The archive location should be
660-
accessible from the standby even when the master is down, i.e. it should
660+
accessible from the standby even when the master is down, i.e., it should
661661
reside on the standby server itself or another trusted server, not on
662662
the master server.
663663
</para>
@@ -2222,7 +2222,7 @@ LOG: database system is ready to accept read only connections
22222222
<itemizedlist>
22232223
<listitem>
22242224
<para>
2225-
Data Definition Language (DDL) - e.g. <command>CREATE INDEX</command>
2225+
Data Definition Language (DDL) - e.g., <command>CREATE INDEX</command>
22262226
</para>
22272227
</listitem>
22282228
<listitem>
@@ -2288,7 +2288,7 @@ LOG: database system is ready to accept read only connections
22882288

22892289
<para>
22902290
WAL file control commands will not work during recovery,
2291-
e.g. <function>pg_start_backup</function>, <function>pg_switch_wal</function> etc.
2291+
e.g., <function>pg_start_backup</function>, <function>pg_switch_wal</function> etc.
22922292
</para>
22932293

22942294
<para>

‎doc/src/sgml/indexam.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ amcanreturn (Relation indexRelation, int attno);
379379
linkend="indexes-index-only-scans"><firstterm>index-only scans</firstterm></link> on
380380
the given column, by returning the indexed column values for an index entry
381381
in the form of an <structname>IndexTuple</structname>. The attribute number
382-
is 1-based, i.e. the first column's attno is 1. Returns true if supported,
382+
is 1-based, i.e., the first column's attno is 1. Returns true if supported,
383383
else false. If the access method does not support index-only scans at all,
384384
the <structfield>amcanreturn</structfield> field in its <structname>IndexAmRoutine</structname>
385385
struct can be set to NULL.

‎doc/src/sgml/install-windows.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
same purpose.
119119
From the <application>Visual Studio Command Prompt</application>, you can
120120
change the targeted CPU architecture, build type, and target OS by using the
121-
<command>vcvarsall.bat</command> command, e.g.
121+
<command>vcvarsall.bat</command> command, e.g.,
122122
<command>vcvarsall.bat x64 10.0.10240.0</command> to target Windows 10
123123
with a 64-bit release build. See <command>-help</command> for the other
124124
options of <command>vcvarsall.bat</command>. All commands should be run from
@@ -251,7 +251,7 @@ $ENV{MSBFLAGS}="/m";
251251
installations <filename>C:\Program Files\GnuWin32</filename>.
252252
Consider installing into <filename>C:\GnuWin32</filename> or use the
253253
NTFS short name path to GnuWin32 in your PATH environment setting
254-
(e.g. <filename>C:\PROGRA~1\GnuWin32</filename>).
254+
(e.g., <filename>C:\PROGRA~1\GnuWin32</filename>).
255255
</para>
256256
</note>
257257

‎doc/src/sgml/libpq.sgml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ PostgresPollingStatusType PQconnectPoll(PGconn *conn);
355355
Conversely, if <function>PQconnectPoll(conn)</function> last returned
356356
<symbol>PGRES_POLLING_WRITING</symbol>, wait until the socket is ready
357357
to write, then call <function>PQconnectPoll(conn)</function> again.
358-
On the first iteration, i.e. if you have yet to call
358+
On the first iteration, i.e., if you have yet to call
359359
<function>PQconnectPoll</function>, behave as if it last returned
360360
<symbol>PGRES_POLLING_WRITING</symbol>. Continue this loop until
361361
<function>PQconnectPoll(conn)</function> returns
@@ -860,7 +860,7 @@ postgresql:///mydb?host=localhost&amp;port=5433
860860

861861
<para>
862862
Percent-encoding may be used to include symbols with special meaning in any
863-
of the <acronym>URI</acronym> parts, e.g. replace <literal>=</literal> with
863+
of the <acronym>URI</acronym> parts, e.g., replace <literal>=</literal> with
864864
<literal>%3D</literal>.
865865

866866
</para>
@@ -919,7 +919,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
919919
<literal>hostaddr</literal>, and <literal>port</literal> options accept a comma-separated
920920
list of values. The same number of elements must be given in each
921921
option that is specified, such
922-
that e.g. the first <literal>hostaddr</literal> corresponds to the first host name,
922+
that e.g., the first <literal>hostaddr</literal> corresponds to the first host name,
923923
the second <literal>hostaddr</literal> corresponds to the second host name, and so
924924
forth. As an exception, if only one <literal>port</literal> is specified, it
925925
applies to all the hosts.
@@ -947,7 +947,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
947947
<para>
948948
If a password file is used, you can have different passwords for
949949
different hosts. All the other connection options are the same for every
950-
host in the list; it is not possible to e.g. specify different
950+
host in the list; it is not possible to e.g., specify different
951951
usernames for different hosts.
952952
</para>
953953
</sect3>
@@ -1123,7 +1123,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
11231123
<listitem>
11241124
<para>
11251125
Maximum wait for connection, in seconds (write as a decimal integer,
1126-
e.g. <literal>10</literal>). Zero, negative, or not specified means
1126+
e.g., <literal>10</literal>). Zero, negative, or not specified means
11271127
wait indefinitely. The minimum allowed timeout is 2 seconds, therefore
11281128
a value of <literal>1</literal> is interpreted as <literal>2</literal>.
11291129
This timeout applies separately to each host name or IP address.
@@ -2332,7 +2332,7 @@ const char *PQsslAttribute(const PGconn *conn, const char *attribute_name);
23322332
<term><literal>cipher</literal></term>
23332333
<listitem>
23342334
<para>
2335-
A short name of the ciphersuite used, e.g.
2335+
A short name of the ciphersuite used, e.g.,
23362336
<literal>"DHE-RSA-DES-CBC3-SHA"</literal>. The names are specific
23372337
to each SSL implementation.
23382338
</para>
@@ -4981,7 +4981,7 @@ int PQflush(PGconn *conn);
49814981
<function>PQflush</function> again. Repeat until
49824982
<function>PQflush</function> returns 0. (It is necessary to check for
49834983
read-ready and drain the input with <function>PQconsumeInput</function>,
4984-
because the server can block trying to send us data, e.g. NOTICE
4984+
because the server can block trying to send us data, e.g., NOTICE
49854985
messages, and won't read our data until we read its.) Once
49864986
<function>PQflush</function> returns 0, wait for the socket to be
49874987
read-ready and then read the response as described above.
@@ -8049,7 +8049,7 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
80498049
For a connection to be known SSL-secured, SSL usage must be configured
80508050
on <emphasis>both the client and the server</emphasis> before the connection
80518051
is made. If it is only configured on the server, the client may end up
8052-
sending sensitive information (e.g. passwords) before
8052+
sending sensitive information (e.g., passwords) before
80538053
it knows that the server requires high security. In libpq, secure
80548054
connections can be ensured
80558055
by setting the <literal>sslmode</literal> parameter to <literal>verify-full</literal> or

‎doc/src/sgml/monitoring.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ postgres 27093 0.0 0.0 30096 2752 ? Ss 11:34 0:00 postgres: ser
206206
When the server shuts down cleanly, a permanent copy of the statistics
207207
data is stored in the <filename>pg_stat</filename> subdirectory, so that
208208
statistics can be retained across server restarts. When recovery is
209-
performed at server start (e.g. after immediate shutdown, server crash,
209+
performed at server start (e.g., after immediate shutdown, server crash,
210210
and point-in-time recovery), all statistics counters are reset.
211211
</para>
212212

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp