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

Commit0431a78

Browse files
committed
Doc: Improve wording of multiple places in documentation
This has been found during its translation.Author: Liudmila MantrovaDiscussion:https://postgr.es/m/CAEkD-mDJHV3bhgezu3MUafJLoAKsOOT86+wHukKU8_NeiJYhLQ@mail.gmail.comBackpatch-through: 12
1 parente136a0d commit0431a78

File tree

9 files changed

+77
-70
lines changed

9 files changed

+77
-70
lines changed

‎doc/src/sgml/catalogs.sgml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3017,9 +3017,9 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</replaceable>:<replaceable>&l
30173017
A <command>DROP</command> of the referenced object will result in
30183018
automatically dropping the dependent object
30193019
whether <literal>CASCADE</literal> is specified or not. If the
3020-
dependent objectis reacheddue to a dependency on some other object,
3021-
thedrop is converted to a drop of the referenced object, so
3022-
that <literal>NORMAL</literal> and <literal>AUTO</literal>
3020+
dependent objecthas to be droppeddue to a dependency on some other
3021+
object being removed, itsdrop is converted to a drop of the referenced
3022+
object, sothat <literal>NORMAL</literal> and <literal>AUTO</literal>
30233023
dependencies of the dependent object behave much like they were
30243024
dependencies of the referenced object.
30253025
Example: a view's <literal>ON SELECT</literal> rule is made
@@ -10967,7 +10967,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
1096710967

1096810968
<para>
1096910969
<structname>pg_stats_ext</structname> is also designed to present the
10970-
information in a more readable format than the underlyingcatalog
10970+
information in a more readable format than the underlyingcatalogs
1097110971
&mdash; at the cost that its schema must be extended whenever new types
1097210972
of extended statistics are added to <structname>pg_statistic_ext</structname>.
1097310973
</para>
@@ -11024,7 +11024,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
1102411024
<entry><structfield>attnames</structfield></entry>
1102511025
<entry><type>name[]</type></entry>
1102611026
<entry><literal><link linkend="catalog-pg-attribute"><structname>pg_attribute</structname></link>.attname</literal></entry>
11027-
<entry>Names of thecolumn the extended statistics is defined on</entry>
11027+
<entry>Names of thecolumns the extended statistics is defined on</entry>
1102811028
</row>
1102911029

1103011030
<row>
@@ -11038,9 +11038,9 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
1103811038
<entry><structfield>n_distinct</structfield></entry>
1103911039
<entry><type>pg_ndistinct</type></entry>
1104011040
<entry></entry>
11041-
<entry>N-distinct counts for combinations ofcolumns. If greater than
11042-
zero, the estimated number of distinct values in the combination. If
11043-
less than zero, the negative of the number of distinct values divided
11041+
<entry>N-distinct counts for combinations ofcolumn values. If greater
11042+
thanzero, the estimated number of distinct values in the combination.
11043+
Ifless than zero, the negative of the number of distinct values divided
1104411044
by the number of rows.
1104511045
(The negated form is used when <command>ANALYZE</command> believes that
1104611046
the number of distinct values is likely to increase as the table grows;
@@ -11063,8 +11063,8 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
1106311063
<entry><type>anyarray</type></entry>
1106411064
<entry></entry>
1106511065
<entry>
11066-
A list of the most common combinations in the columns. (Null if
11067-
novalues seem to be more common than any others.)
11066+
A list of the most common combinationsof valuesin the columns.
11067+
(Null ifnocombinations seem to be more common than any others.)
1106811068
</entry>
1106911069
</row>
1107011070

‎doc/src/sgml/client-auth.sgml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,8 @@ hostnogssenc <replaceable>database</replaceable> <replaceable>user</replaceable
196196
</para>
197197

198198
<para>
199-
Note that the only supported <xref linkend="auth-methods"/> for use
199+
Note that the only supported
200+
<link linkend="auth-methods">authentication methods</link> for use
200201
with <acronym>GSSAPI</acronym> encryption
201202
are <literal>gss</literal>, <literal>reject</literal>,
202203
and <literal>trust</literal>.
@@ -489,7 +490,7 @@ hostnogssenc <replaceable>database</replaceable> <replaceable>user</replaceable
489490
<listitem>
490491
<para>
491492
Use GSSAPI to authenticate the user. This is only
492-
available for TCP/IP connections. See <xref
493+
available for TCP/IP connections. See <xref
493494
linkend="gssapi-auth"/> for details. It can be used in conjunction
494495
with GSSAPI encryption.
495496
</para>
@@ -610,8 +611,8 @@ hostnogssenc <replaceable>database</replaceable> <replaceable>user</replaceable
610611
<literal>verify-full</literal> additionally enforces that the
611612
<literal>cn</literal> (Common Name) in the certificate matches
612613
the username or an applicable mapping.
613-
This behavior is similar to the cert authentication method
614-
(see <xref linkend="auth-cert"/>) but enables pairing
614+
This behavior is similar to the<literal>cert</literal> authentication
615+
method(see <xref linkend="auth-cert"/>) but enables pairing
615616
the verification of client certificates with any authentication
616617
method that supports <literal>hostssl</literal> entries.
617618
</para>

‎doc/src/sgml/config.sgml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3146,29 +3146,29 @@ include_dir 'conf.d'
31463146
</para>
31473147

31483148
<para>
3149-
To start the server in standby mode create file called
3149+
To start the server in standby mode, create a file called
31503150
<filename>standby.signal</filename><indexterm><primary>standby.signal</primary></indexterm>
31513151
in the data directory. The server will enter recovery and will not stop
31523152
recovery when the end of archived WAL is reached, but will keep trying to
31533153
continue recovery by connecting to the sending server as specified by the
31543154
<varname>primary_conninfo</varname> setting and/or by fetching new WAL
3155-
segments using <varname>restore_command</varname>. In this mode, youmay
3155+
segments using <varname>restore_command</varname>. In this mode, youcan
31563156
use parameters in both <xref
31573157
linkend="runtime-config-wal-archive-recovery"/> and <xref
3158-
linkend="runtime-config-replication-standby"/> sections. Parameters from
3158+
linkend="runtime-config-replication-standby"/>. Parameters from
31593159
<xref linkend="runtime-config-wal-recovery-target"/> will not be used.
31603160
</para>
31613161

31623162
<para>
3163-
To start the server in targeted recovery create a file called
3163+
To start the server in targeted recoverymode,create a file called
31643164
<filename>recovery.signal</filename><indexterm><primary>recovery.signal</primary></indexterm>
31653165
in the data directory. If both <filename>standby.signal</filename> and
31663166
<filename>recovery.signal</filename> files are created, standby mode
3167-
takes precedence. Targeted recovery modewill endwhenend ofarchived
3168-
WAL is reached, or when <varname>recovery_target</varname> is reached.
3169-
In this mode youmay use parameters from both <xref
3167+
takes precedence. Targeted recovery modeendswhenthearchived WAL is
3168+
fully replayed, or when <varname>recovery_target</varname> is reached.
3169+
In this mode, youcan use parameters from both <xref
31703170
linkend="runtime-config-wal-archive-recovery"/> and <xref
3171-
linkend="runtime-config-wal-recovery-target"/> sections. Parameters from <xref
3171+
linkend="runtime-config-wal-recovery-target"/>. Parameters from <xref
31723172
linkend="runtime-config-replication-standby"/> will not be used.
31733173
</para>
31743174

@@ -8032,8 +8032,9 @@ SET XML OPTION { DOCUMENT | CONTENT };
80328032
given decimal precision. The precision used is the standard number of
80338033
digits for the type (<literal>FLT_DIG</literal>
80348034
or <literal>DBL_DIG</literal> as appropriate) reduced according to the
8035-
value of this parameter. (For example, specifying -1 will cause float4
8036-
values to be output rounded to 5 significant digits, and float8 values
8035+
value of this parameter. (For example, specifying -1 will cause
8036+
<type>float4</type> values to be output rounded to 5 significant
8037+
digits, and <type>float8</type> values
80378038
rounded to 14 digits.) This format is slower and does not preserve all
80388039
the bits of the binary float value, but may be more human-readable.
80398040
</para>
@@ -9201,10 +9202,10 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
92019202
</term>
92029203
<listitem>
92039204
<para>
9204-
Reports the name of the SSL library that this PostgreSQL server was
9205-
built with (even if SSL is not currently configured or in use on this
9206-
instance), for example <literal>OpenSSL</literal>,oran empty string
9207-
if none.
9205+
Reports the name of the SSL library that this
9206+
<productname>PostgreSQL</productname> server wasbuilt with (even if
9207+
SSL is not currently configuredorin use on this instance), for
9208+
example <literal>OpenSSL</literal>, or an empty stringif none.
92089209
</para>
92099210
</listitem>
92109211
</varlistentry>

‎doc/src/sgml/ecpg.sgml

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -312,14 +312,14 @@ current=testdb1 (should be testdb1)
312312
</para>
313313

314314
<para>
315-
The third option is to declare asql identifier linked to
315+
The third option is to declare aSQL identifier linked to
316316
the connection, for example:
317317
<programlisting>
318318
EXEC SQL AT <replaceable>connection-name</replaceable> DECLARE <replaceable>statement-name</replaceable> STATEMENT;
319319
EXEC SQL PREPARE <replaceable>statement-name</replaceable> FROM :<replaceable>dyn-string</replaceable>;
320320
</programlisting>
321-
Once you link asql identifier to a connection,youexecute a dynamic SQL
322-
withoutAT clause.
321+
Once you link aSQL identifier to a connection, execute dynamic SQL
322+
statements using this identifierwithoutthe <literal>AT</literal> clause.
323323
</para>
324324
</sect2>
325325

@@ -1209,8 +1209,8 @@ EXEC SQL END DECLARE SECTION;
12091209
<title id="ecpg-type-bytea">bytea</title>
12101210

12111211
<para>
1212-
The handling of the <type>bytea</type> type isalsosimilar to
1213-
the <type>VARCHAR</type>. The definition on an array of type
1212+
The handling of the <type>bytea</type> type is similar to
1213+
that of <type>VARCHAR</type>. The definition on an array of type
12141214
<type>bytea</type> is converted into a named struct for every
12151215
variable. A declaration like:
12161216
<programlisting>
@@ -1221,8 +1221,8 @@ bytea var[180];
12211221
struct bytea_var { int len; char arr[180]; } var;
12221222
</programlisting>
12231223
The member <structfield>arr</structfield> hosts binary format
1224-
data. Italsocanhandle even <literal>'\0'</literal> as part of
1225-
data unlike <type>VARCHAR</type>.
1224+
data. It canalso handle <literal>'\0'</literal> as part of
1225+
data, unlike <type>VARCHAR</type>.
12261226
The data is converted from/to hex format and sent/received by
12271227
ecpglib.
12281228
</para>
@@ -6810,7 +6810,7 @@ EXEC SQL DECLARE cur1 CURSOR FOR stmt1;
68106810
<refentry id="ecpg-sql-declare-statement">
68116811
<refnamediv>
68126812
<refname>DECLARE STATEMENT</refname>
6813-
<refpurpose>declares SQL statement identifier associated with connection</refpurpose>
6813+
<refpurpose>declaresaSQL statement identifier associated with connection</refpurpose>
68146814
</refnamediv>
68156815

68166816
<refsynopsisdiv>
@@ -6823,12 +6823,13 @@ EXEC SQL [ AT <replaceable class="parameter">connection_name</replaceable> ] DEC
68236823
<title>Description</title>
68246824

68256825
<para>
6826-
<command>DECLARE STATEMENT</command> declares SQL statement identifier.
6827-
SQL statement identifier is associated with connection.
6826+
<command>DECLARE STATEMENT</command> declaresaSQL statement identifier
6827+
to be associated with connection.
68286828
</para>
68296829

68306830
<para>
6831-
<command>DECLARE CURSOR</command> with a SQL statement identifier can be written before PREPARE.
6831+
<command>DECLARE CURSOR</command> with an SQL statement identifier
6832+
can be written before <command>PREPARE</command>.
68326833
</para>
68336834
</refsect1>
68346835

@@ -6843,7 +6844,8 @@ EXEC SQL [ AT <replaceable class="parameter">connection_name</replaceable> ] DEC
68436844
A database connection name established by the <command>CONNECT</command> command.
68446845
</para>
68456846
<para>
6846-
If AT clause is omitted, an SQL statement identifier is associated with the DEFAULT connection.
6847+
If the <literal>AT</literal> clause is omitted, the SQL statement
6848+
identifier is associated with the <literal>DEFAULT</literal> connection.
68476849
</para>
68486850
</listitem>
68496851
</varlistentry>
@@ -6854,7 +6856,8 @@ EXEC SQL [ AT <replaceable class="parameter">connection_name</replaceable> ] DEC
68546856
<term><replaceable class="parameter">statement_name</replaceable></term>
68556857
<listitem>
68566858
<para>
6857-
The name of a SQL statement identifier, either as an SQL identifier or a host variable.
6859+
The name of the SQL statement identifier, either as an SQL identifier
6860+
or a host variable.
68586861
</para>
68596862
</listitem>
68606863
</varlistentry>
@@ -6864,26 +6867,27 @@ EXEC SQL [ AT <replaceable class="parameter">connection_name</replaceable> ] DEC
68646867
<refsect1>
68656868
<title>Notes</title>
68666869
<para>
6867-
AT clause can be used at other dynamic SQL statements. The following table
6868-
gives the connected database when AT clause is used at DECLARE STATEMENT
6869-
and other dynamic statements.
6870+
The <literal>AT</literal> clause can be used with both
6871+
<command>DECLARE STATEMENT</command> and other dynamic SQL statements.
6872+
The following table illustrates how it affects the selected database
6873+
connection.
68706874
</para>
68716875
<table tocentry="1" id="ecpg-declare-statement-table">
68726876
<title>Scenario</title>
68736877
<tgroup cols="4">
68746878
<thead>
68756879
<row>
68766880
<entry>
6877-
Using Scenario
6881+
Usage Scenario
68786882
</entry>
68796883
<entry>
6880-
Declare Statement
6884+
DECLARE STATEMENT
68816885
</entry>
68826886
<entry>
68836887
Other Dynamic Statements
68846888
</entry>
68856889
<entry>
6886-
Executed Database
6890+
Target Database
68876891
</entry>
68886892
</row>
68896893
</thead>
@@ -6893,10 +6897,10 @@ EXEC SQL [ AT <replaceable class="parameter">connection_name</replaceable> ] DEC
68936897
1
68946898
</entry>
68956899
<entry>
6896-
WithoutAT clause
6900+
Without<literal>AT</literal>
68976901
</entry>
68986902
<entry>
6899-
WithoutAT clause
6903+
Without<literal>AT</literal>
69006904
</entry>
69016905
<entry>
69026906
Default connection
@@ -6907,10 +6911,10 @@ EXEC SQL [ AT <replaceable class="parameter">connection_name</replaceable> ] DEC
69076911
2
69086912
</entry>
69096913
<entry>
6910-
Using AT clause connecting atcon1
6914+
With <literal>AT</literal> that connects to <literal>con1</literal>
69116915
</entry>
69126916
<entry>
6913-
WithoutAT clause
6917+
Without<literal>AT</literal>
69146918
</entry>
69156919
<entry>
69166920
con1
@@ -6921,10 +6925,10 @@ EXEC SQL [ AT <replaceable class="parameter">connection_name</replaceable> ] DEC
69216925
3
69226926
</entry>
69236927
<entry>
6924-
Using AT clause connecting atcon1
6928+
With <literal>AT</literal> that connects to <literal>con1</literal>
69256929
</entry>
69266930
<entry>
6927-
Using AT clause connecting atcon2
6931+
With <literal>AT</literal> that connects to <literal>con2</literal>
69286932
</entry>
69296933
<entry>
69306934
con1
@@ -6935,10 +6939,10 @@ EXEC SQL [ AT <replaceable class="parameter">connection_name</replaceable> ] DEC
69356939
4
69366940
</entry>
69376941
<entry>
6938-
WithoutAT clause
6942+
Without<literal>AT</literal>
69396943
</entry>
69406944
<entry>
6941-
Using AT clause connecting atcon2
6945+
With <literal>AT</literal> that connects to <literal>con2</literal>
69426946
</entry>
69436947
<entry>
69446948
con2
@@ -6948,7 +6952,7 @@ EXEC SQL [ AT <replaceable class="parameter">connection_name</replaceable> ] DEC
69486952
</tgroup>
69496953
</table>
69506954
<para>
6951-
In scenario 4, DECLARE STATEMENT will be ignored.
6955+
In scenario 4,<command>DECLARE STATEMENT</command> will be ignored.
69526956
</para>
69536957
</refsect1>
69546958

‎doc/src/sgml/libpq.sgml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5620,13 +5620,13 @@ PGVerbosity PQsetErrorVerbosity(PGconn *conn, PGVerbosity verbosity);
56205620
returning the connection's previous setting.
56215621
In <firstterm>TERSE</firstterm> mode, returned messages include
56225622
severity, primary text, and position only; this will normally fit on a
5623-
single line. Thedefault mode produces messages that include the above
5624-
plus any detail, hint, or context fields (these might span multiple
5625-
lines). The <firstterm>VERBOSE</firstterm> mode includes all available
5626-
fields. The <firstterm>SQLSTATE</firstterm> mode includes only the
5627-
error severity and the <symbol>SQLSTATE</symbol> error code, if one is
5628-
available (if not, the output is like <firstterm>TERSE</firstterm>
5629-
mode).
5623+
single line. The<firstterm>DEFAULT</firstterm> mode produces messages
5624+
that include the aboveplus any detail, hint, or context fields (these
5625+
might span multiplelines). The <firstterm>VERBOSE</firstterm> mode
5626+
includes all availablefields. The <firstterm>SQLSTATE</firstterm>
5627+
mode includes only theerror severity and the <symbol>SQLSTATE</symbol>
5628+
error code, if one isavailable (if not, the output is like
5629+
<firstterm>TERSE</firstterm>mode).
56305630
</para>
56315631

56325632
<para>

‎doc/src/sgml/maintenance.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,7 @@ analyze threshold = analyze base threshold + analyze scale factor * number of tu
871871
<xref linkend="sql-reindex"/> can be used safely and easily in all cases.
872872
This command requires an <literal>ACCESS EXCLUSIVE</literal> lock by
873873
default, hence it is often preferable to execute it with its
874-
<literal>CONCURRENTLY</literal> option which requires only a
874+
<literal>CONCURRENTLY</literal> option, which requires only a
875875
<literal>SHARE UPDATE EXCLUSIVE</literal> lock.
876876
</para>
877877
</sect1>

‎doc/src/sgml/planstats.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -681,8 +681,8 @@ EXPLAIN (ANALYZE, TIMING OFF) SELECT * FROM t WHERE a = 1 AND b = 10;
681681
</programlisting>
682682

683683
Secondly, <acronym>MCV</acronym> lists handle a wider range of clause types,
684-
not just equality clauses like functional dependencies.See forexample the
685-
examplerange query, presented earlier:
684+
not just equality clauses like functional dependencies.Forexample,
685+
consider the followingrange query for the same table:
686686

687687
<programlisting>
688688
EXPLAIN (ANALYZE, TIMING OFF) SELECT * FROM t WHERE a &lt;= 49 AND b &gt; 49;

‎doc/src/sgml/ref/create_table.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2239,9 +2239,9 @@ CREATE TABLE cities_partdef
22392239
Typed tables implement a subset of the SQL standard. According to
22402240
the standard, a typed table has columns corresponding to the
22412241
underlying composite type as well as one other column that is
2242-
the <quote>self-referencing column</quote>. PostgreSQL does not
2243-
support theseself-referencing columns explicitly, but the same
2244-
effect can be had using the OID feature.
2242+
the <quote>self-referencing column</quote>.
2243+
<productname>PostgreSQL</productname> does not supportself-referencing
2244+
columns explicitly.
22452245
</para>
22462246
</refsect2>
22472247

‎doc/src/sgml/storage.sgml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,8 @@ data. Empty in ordinary tables.</entry>
957957
only present if the <firstterm>HEAP_HASNULL</firstterm> bit is set in
958958
<structfield>t_infomask</structfield>. If it is present it begins just after
959959
the fixed header and occupies enough bytes to have one bit per data column
960-
(that is, <structfield>t_natts</structfield> bits altogether). In this list of bits, a
960+
(that is, the number of bits that equals the attribute count in
961+
<structfield>t_infomask2</structfield>). In this list of bits, a
961962
1 bit indicates not-null, a 0 bit is a null. When the bitmap is not
962963
present, all columns are assumed not-null.
963964
The object ID is only present if the <firstterm>HEAP_HASOID_OLD</firstterm> bit

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp