Merge branch 'PGPROEE9_6' into PGPROEE9_6_RUSDOC

dmpgpro · dmpgpro · commit 3df546b552a1 · 2017-10-13T18:49:35.000+03:00
diff --git a/doc/src/sgml/ref/pgbench.sgml b/doc/src/sgml/ref/pgbench.sgml
@@ -1537,7 +1537,8 @@ script statistics:
    (see <xref linkend="transactions-and-scripts"
    endterm="transactions-and-scripts-title"> for more information). If the total
    number of retried transactions is non-zero, the main report also contains
-   the total number of retries and the number of retries after each kind of
+   the total number of retried transactions, the total number of retries, and
+   the number of retries after each kind of
    failure (use option <option>--max-tries</> to make it possible). The
    per-statement report inherits all columns from the main report.
   </para>
diff --git a/doc/src/sgml/release-proee-9.6.sgml b/doc/src/sgml/release-proee-9.6.sgml
@@ -15,13 +15,13 @@
     <itemizedlist>
       <listitem>
       <para>
-      Updated <productname>pg_pathman</productname> module to version
+      Updated <application>pg_pathman</application> module to version
       1.4.7.
       </para>
       </listitem>
       <listitem>
       <para>
-      Updated <productname>pg_probackup</productname> utility to version
+      Updated <application>pg_probackup</application> utility to version
       2.0.8.
       </para>
       </listitem>
@@ -48,7 +48,8 @@
       </listitem>
       <listitem>
       <para>
-      fix incompatibility of pg_pathman and online_analyze extensions.
+      Fixed incompatibility between <application>pg_pathman</application> and
+      <application>online_analyze</application> extensions.
       </para>
       </listitem>
       </itemizedlist>
