Merge branch 'PGPRO9_6' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into PGPRO9_6

Author: dmpgpro

doc/src/sgml/jsquery.sgml

@@ -52,7 +52,7 @@
     <title>Installation</title>
     <para>
       When you installed <productname>Postgres Pro</productname> distribution, jsquery is available
-      as a contrib moudle. Install contrib modules (postgrespro-contrib
+      as a contrib module. Install contrib modules (postgrespro-contrib
       package in the binary distribution for Linux, or make -C contrib
       install if you are building from source), then start psql shell
       and type

doc/src/sgml/mchar.sgml

@@ -15,15 +15,15 @@
     It implements types MCHAR and MVARCHAR, which are bug-to-bug
     compatible with MSSQL CHAR and VARCHAR respectively. Additionaly, 
     these types use libicu for comparation and case conversion, so their
-    behavoir is identical across different operating system.
+    behavior is identical across different operating systems.
     </para>
     <para>
-    PostgresPro also includes <xref linkend="citext"> extension which
+    &productname; also includes <xref linkend="citext"> extension which
     provides types similar to MCHAR. But this extension doesn't emulate
-    MS-SQL behavoir concerning end-of-value whitespace.
+    MS-SQL behavior concerning end-of-value whitespace.
     </para>
     <para>
-    Differences from PostgreSQL standard CHAR and VARCHAR are:
+    Differences from &productname; standard CHAR and VARCHAR are:
     </para>
     <itemizedlist>
     <listitem>

doc/src/sgml/pgpathman.sgml

@@ -371,7 +371,8 @@ doc/src/sgml/pgprobackup.sgml
       <listitem>
        <para>
          Specifies the number of full backup
-    copies to keep in the data directory. Must be a positive integer.
+    copies to keep in the data directory. Must be a positive integer.</para>
+    <para>You can use this option with the <command>retention purge</command> command to override the default retention policy set in <filename>pg_probackup.conf</filename>.
        </para>
       </listitem>
      </varlistentry>
@@ -380,7 +381,8 @@ doc/src/sgml/pgprobackup.sgml
       <term><option>window</option></term>
       <listitem>
        <para>
-         Defines the earliest point in time for which <application>pg_probackup</application> can complete the recovery. This option is set in the number of days from the current moment. For example, if <option>window</option>=7, <application>pg_probackup</application> must keep at least one full backup copy that is older than seven days, with all the corresponding WAL files. 
+         Defines the recovery point, in the number of days from the current moment. This is the earliest point in time for which <application>pg_probackup</application> can complete the recovery. For example, if <option>window</option>=7, <application>pg_probackup</application> must keep at least one full backup copy that is older than seven days, with all the corresponding WAL files.</para>
+    <para>You can use this option with the <command>retention purge</command> command to override the default retention policy set in <filename>pg_probackup.conf</filename>.
        </para>
       </listitem>
      </varlistentry>
@@ -664,7 +666,7 @@ pg_probackup show
 
       <listitem>
        <para>
-         Recovery time &mdash; the least moment of time, the database cluster's state can be restored at.
+         Recovery time &mdash; the earliest moment for which you can restore the state of the database cluster.
        </para>
       </listitem>
 

doc/src/sgml/pgprobackup.sgml

@@ -11,20 +11,21 @@
       Whether somebody think it's bad or not, but sometime it's very
       interesting to be able to control planner (provide hints, which tell
       optimizer to ignore its algorithm in part), which is currently
-      impossible in PostgreSQL. Oracle, for example, has over 120 hints,
+      impossible in &productname; (and PostgreSQL).
+      Oracle, for example, has over 120 hints,
       and Microsoft SQL Server also supports hints.
     </para>
     <para>
       This first version of plantuner provides a possibility to hide
-      specified indexes from PostgreSQL planner, so it will not use them.
+      specified indexes from &productname; planner, so it will not use them.
     </para>
     <para>
       There are many situations when developer want to temporarily disable
       specific index(es), without dropping them, or to instruct planner to
       use specific index.
     </para>
     <para>
-      Next, for some workload PostgreSQL could be too pessimistic for
+      Next, for some workload &productname; could be too pessimistic for
       newly created tables and assumes much more rows in table than
       it actually has. If plantuner.fix_empty_table GUC variable is set
       to true then module will set to zero the number of pages/tuples of

doc/src/sgml/plantuner.sgml

@@ -1,6 +1,6 @@
 <!--
 doc/src/sgml/ref/waitlsn.sgml
-PostgreSQL documentation
+&productname; documentation
 -->
 
 <refentry id="SQL-WAITLSN">
@@ -37,7 +37,7 @@ WAITLSN <replaceable class="PARAMETER">'LSN'</replaceable> [ , <replaceable clas
   <para>
    <command>WAITLSN</command> provides a simple
    interprocess <acronym>LSN</> wait mechanism for a backends on slave
-   in master-slave replication scheme on <productname>PostgreSQL</productname> database.
+   in master-slave replication scheme on <productname>&productname;</productname> database.
   </para>
  </refsect1>
 

doc/src/sgml/ref/waitlsn.sgml

@@ -260,7 +260,7 @@ INSERT INTO mytab (complex_col.r, complex_col.i) VALUES(1.1, 2.2);
   </para>
 
   <para>
-   In <productname>PostgreSQL</>, a reference to a table name (or alias)
+   In <productname>&productname;</>, a reference to a table name (or alias)
    in a query is effectively a reference to the composite value of the
    table's current row.  For example, if we had a table
    <structname>inventory_item</> as shown
@@ -306,7 +306,7 @@ SELECT c.* FROM inventory_item c;
 <programlisting>
 SELECT c.name, c.supplier_id, c.price FROM inventory_item c;
 </programlisting>
-   <productname>PostgreSQL</> will apply this expansion behavior to
+   <productname>&productname;</> will apply this expansion behavior to
    any composite-valued expression, although as shown <link
    linkend="rowtypes-accessing">above</link>, you need to write parentheses
    around the value that <literal>.*</> is applied to whenever it's not a
@@ -322,7 +322,7 @@ SELECT (myfunc(x)).a, (myfunc(x)).b, (myfunc(x)).c FROM some_table;
 
   <tip>
    <para>
-    <productname>PostgreSQL</> handles column expansion by
+    <productname>&productname;</> handles column expansion by
     actually transforming the first form into the second.  So, in this
     example, <function>myfunc()</> would get invoked three times per row
     with either syntax.  If it's an expensive function you may wish to