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

dmpgpro · dmpgpro · commit 392623eb1c8a · 2016-12-12T15:45:35.000+03:00
diff --git a/doc/src/sgml/mvcc.sgml b/doc/src/sgml/mvcc.sgml
@@ -1037,7 +1037,7 @@ ERROR:  could not serialize access due to read/write dependencies among transact
      <para>
       Besides, there are two additional lock modes designed to support
       <application>1C Enterprise</application>. These modes do not conflict
-      with any other lock modes described above. They use is possible, but not
+      with any other lock modes described above. Their use is possible, but not
       encouraged, as <link linkend="advisory-locks">advisory locks</link> provide
       the same functionality.
      </para>
diff --git a/doc/src/sgml/pgprobackup.sgml b/doc/src/sgml/pgprobackup.sgml
@@ -1149,7 +1149,9 @@ pg_probackup restore -j 4
      <listitem>
       <para>
         Only full backups are supported when using
-        <ulink url="https://postgrespro.com/docs/postgresproee/current/cfs.html">compressed tablespaces</link>
+        <ulink
+        url="https://postgrespro.com/docs/postgresproee/current/cfs.html">compressed
+        tablespaces</ulink>
         (<productname>Postgres Pro Enterprise</productname> feature).
       </para>
      </listitem>
