Skip to content

Commit d0e7229

Browse files
vbwagnervbwagner
committed
Merge branch 'PGPRO9_6' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into PGPRO9_6
2 parents f190425 + d61cb93 commit d0e7229

12 files changed

+22
-19
lines changed

‎doc/src/sgml/config-one-c.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ temp_buffers = 32MB
3030
<programlisting>
3131
max_locks_per_transaction = 256
3232
</programlisting>
33-
<para>Typically, <productname>1C</productname> solutions use a lot of temporary tables. Every backend process usually contains multiple temporary tables. When closing a connection, <productname>&productname;</productname> tries to drop all temporary tables in a single transactio, so this transaction may use a lot of locks. If the number of locks exceeds the <varname>max_locks_per_transaction</varname> value, the transaction will fail, leaving multiple orphaned temporary tables.
33+
<para>Typically, <productname>1C</productname> solutions use a lot of temporary tables. Every backend process usually contains multiple temporary tables. When closing a connection, <productname>&productname;</productname> tries to drop all temporary tables in a single transaction, so this transaction may use a lot of locks. If the number of locks exceeds the <varname>max_locks_per_transaction</varname> value, the transaction will fail, leaving multiple orphaned temporary tables.
3434
</para>
3535
</listitem>
3636
</itemizedlist>

‎doc/src/sgml/dump-stat.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<link linkend="catalog-pg-statistic"><structname>pg_statistic</structname></link>
1414
table. The <function>dump_statistic</> function generates <literal>INSERT</>
1515
statements which can later be applied to a compatible database. The extension
16-
should be installed on the recipient server in order to successfuly restore
16+
should be installed on the recipient server in order to successfully restore
1717
statistical data since these statements heavily rely on the provided functions.
1818
</para>
1919

‎doc/src/sgml/fulleq.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<para>
1313
The <productname>&productname;</productname> equivalence operator is
1414
defined to return NULL when both operands are NULLs. However, the Microsoft
15-
SQL Servers family traditionaly defines other semantic for equivalence
15+
SQL Servers family traditionally defines other semantic for equivalence
1616
operator, where operator returns TRUE in the case of both nulled operands.
1717
This module provides such operator with MSSQL semantic.
1818
</para>

‎doc/src/sgml/intro.sgml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,10 @@
223223
</listitem>
224224
<listitem>
225225
<simpara><application>plantuner</application> module provides hits for planner, which can do disable or enable indexes for query execution.</simpara>
226-
</listitem>
226+
</listitem>
227+
<listitem>
228+
<simpara><application>pg_tsparser</application> module is an alternative text search parser.</simpara>
229+
</listitem>
227230
</itemizedlist>
228231
</para>
229232

‎doc/src/sgml/jsquery.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ CREATE TABLE js (
588588
Unfortunately, jsonb have no statistics yet. That's why JsQuery
589589
optimizer has to do imperative decision while selecting
590590
conditions to be evaluated using index. This decision is made by
591-
assumtion that some condition types are less selective than
591+
assumption that some condition types are less selective than
592592
others. Optimizer divides conditions into following selectivity
593593
class (listed by descending of selectivity).
594594
</para>

‎doc/src/sgml/mchar.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
</para>
1414
<para>
1515
It implements types MCHAR and MVARCHAR, which are bug-to-bug
16-
compatible with MSSQL CHAR and VARCHAR respectively. Additionaly,
17-
these types use libicu for comparation and case conversion, so their
16+
compatible with MSSQL CHAR and VARCHAR respectively. Additionally,
17+
these types use libicu for comparison and case conversion, so their
1818
behavior is identical across different operating systems.
1919
</para>
2020
<para>
@@ -28,7 +28,7 @@
2828
<itemizedlist>
2929
<listitem>
3030
<para>
31-
Case insensitive comparation
31+
Case insensitive comparison
3232
</para>
3333
</listitem>
3434
<listitem>

‎doc/src/sgml/pgprobackup.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ pg_probackup show
687687

688688
<listitem>
689689
<para>
690-
Time &mdash; time it took to peform the backup.
690+
Time &mdash; time it took to perform the backup.
691691
</para>
692692
</listitem>
693693

‎doc/src/sgml/pgquerystate.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<title>Overview</title>
99
<para>
1010
Each nonutility query statement (SELECT/INSERT/UPDATE/DELETE) after
11-
optimization/planning stage is translated into plan tree wich is kind of
11+
optimization/planning stage is translated into plan tree, which is kind of
1212
imperative representation of declarative SQL query. EXPLAIN ANALYZE
1313
request allows to demonstrate execution statistics gathered from each
1414
node of plan tree (full time of execution, number of rows emitted to upper
@@ -138,7 +138,7 @@
138138
</listitem>
139139
<listitem>
140140
<para>
141-
format - EXPLAIN format to be used for plans printing, posible values:
141+
format - EXPLAIN format to be used for plans printing, possible values:
142142
text, xml, json, yaml.
143143
</para>
144144
</listitem>
@@ -150,7 +150,7 @@
150150
</para>
151151
<para>
152152
Calling role have to be superuser or member of the role whose backend is
153-
being called. Othrewise function prints ERROR message
153+
being called. Otherwise function prints ERROR message
154154
<literal>permission denied</literal>.
155155
</para>
156156
</sect2>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
513513
index on the column or group of columns used in the constraint.
514514
Optional clause <literal>INCLUDE</literal> allows to add into the index
515515
a portion of columns on which the uniqueness is not enforced upon.
516-
Note, that althogh constraint is not enforced upon included columns, it still
516+
Note, that although constraint is not enforced upon included columns, it still
517517
depends on them. Consequently, some operations on these columns (e.g. <literal>DROP COLUMN</literal>)
518518
can cause cascade constraint and index deletion.
519519
See paragraph about <literal>INCLUDE</literal> in
@@ -555,7 +555,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
555555
index on the column or group of columns used in the constraint.
556556
An optional clause <literal>INCLUDE</literal> allows to add into the index
557557
a portion of columns on which the constraint is not enforced upon.
558-
Note, that althogh constraint is not enforced upon included columns, it still
558+
Note, that although constraint is not enforced upon included columns, it still
559559
depends on them. Consequently, some operations on these columns (e.g. <literal>DROP COLUMN</literal>)
560560
can cause cascade constraint and index deletion.
561561
See paragraph about <literal>INCLUDE</literal> in

‎doc/src/sgml/ref/waitlsn.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ WAITLSN <replaceable class="PARAMETER">'LSN'</replaceable> [ , <replaceable clas
5757
<term><replaceable class="PARAMETER">delay</replaceable></term>
5858
<listitem>
5959
<para>
60-
Time in miliseconds to waiting for LSN to be replayed.
60+
Time to wait for LSN to be replayed, in milliseconds.
6161
</para>
6262
</listitem>
6363
</varlistentry>
@@ -69,7 +69,7 @@ WAITLSN <replaceable class="PARAMETER">'LSN'</replaceable> [ , <replaceable clas
6969

7070
<para>
7171
Delay time to waiting for LSN to be replayed must be integer. For
72-
default it is infinity. Waiting can be interupped using Ctl+C, or
72+
default it is infinity. Waiting can be interrupted using Ctl+C, or
7373
by Postmaster death.
7474
</para>
7575
</refsect1>

‎doc/src/sgml/release-pro-9.6.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@
337337
use of <xref linkend="pgupgrade">, is required for those
338338
wishing to migrate data from any previous release.</para>
339339

340-
<para>Dump/restore is not neccessary when migrating from PostgreSQL 9.6.x to
340+
<para>Dump/restore is not necessary when migrating from PostgreSQL 9.6.x to
341341
Postgres Pro 9.6.x.y.</para>
342342

343343
<para>When upgrading from previous releases of Postgres Pro or from

‎doc/src/sgml/sr_plan.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<para>
2121
Typically, DBA would play with queries interactively, and save
2222
their plans and then enable use of saved plans for the queries,
23-
where predictable responce time is essential.
23+
where predictable response time is essential.
2424
</para>
2525
<para>
2626
Then application which uses these queries would use saved plans.
@@ -136,7 +136,7 @@ SET
136136
<literal>_p()</> function.
137137
</para>
138138
<programlisting>
139-
=&gt;update sr_plans set enable = true where quesry=
139+
=&gt;update sr_plans set enable = true where query=
140140
'select a,b from test_table where a = _p(1)';
141141
UPDATE 1
142142
-- These queries would use saved plan

0 commit comments

Comments
 (0)