Merge remote-tracking branch 'origin/PGPRO10' into PGPRO-626-ICU

Author: Marina Polyakova

doc/src/sgml/release-pro-10.sgml

@@ -5,7 +5,7 @@
   <title>Postgres Pro 10.0.1</title>
   <formalpara>
     <title>Release Date:</title>
-    <para>2017-10-25</para>
+    <para>2017-10-31</para>
   </formalpara>
   <sect2>
     <title>Overview</title>
@@ -106,6 +106,24 @@
       You must take it into account when upgrading to this release
       to avoid breaking indexes and constraints.
     </para>
+    <important>
+      <para>
+        If your current <productname>Postgres Pro</productname> installation
+        uses ICU, do not update ICU library to a newer version.
+        Otherwise, you cannot upgrade to <productname>Postgres Pro</productname> 10.
+      </para>
+    </important>
+    <important>
+      <para>
+        For <productname>PostgreSQL</productname> 9.5 and 9.5.1,
+        as well as <productname>Postgres Pro</productname> 9.5.0.1 and
+        9.5.1.2, you cannot perform an upgrade to
+        <productname>Postgres Pro</productname> 10 directly. If you are
+        using one of these versions, upgrade your installation to an
+        intermediate version first, such as
+        <productname>Postgres Pro</productname> 9.5.2.1.
+      </para>
+    </important>
     <para>
       When using <xref linkend="pgupgrade">, make sure that
       <xref linkend="APP-INITDB"> sets the correct default collation provider
@@ -118,32 +136,46 @@
           </para>
         </listitem>
         <listitem>
-          <para>When upgrading from <productname>Postgres Pro</productname>, omit the default collation
-          provider option to select the required collation provider automatically.
-          In this case, <literal>libc</literal> provider will be used for C and POSIX locales,
-          while <literal>icu</literal> provider will be used for all the other locales.
+          <para>When upgrading from <productname>Postgres Pro</productname>, omit
+          the default collation provider option to select the required collation
+          provider automatically. In this case, <literal>libc</literal> provider
+          will be used for databases with C and POSIX locales, as well as for all
+          databases with single-byte encodings, while <literal>icu</literal>
+          provider will be used for all the other cases.
           </para>
         </listitem>
       </itemizedlist>
-      <para>If <application>pg_upgrade</application> creates any SQL files in its
-          current directory, run these files to complete the upgrade.
-          For example, if the previous installation
-          contained any indexes or constraints with non-default collations,
-          <application>pg_upgrade</application> declares such indexes and
-          constraints invalid and creates <filename>reindex_text_indexes.sql</filename>
-          and <filename>validate_text_contraints.sql</filename>, respectively.
-       </para>
+      <para>If <application>pg_upgrade</application> creates any SQL files in
+          its current directory, run these files to complete the upgrade.
+      </para>
 
       <para>
         When you are using <xref linkend="app-pg-dumpall">
-        to perform the upgrade, <productname>Postgres Pro</productname> uses the collation provider
-        specified with the <command>initdb</command> command for the new cluster.
-        In this case, indexes are rebuilt automatically, but you may need to
-        manually resolve constraint issues if there are any constraints
-        depending on non-default collations. For details on the default
-        collation providers, see <xref linkend="collation-managing">.
+        to perform the upgrade, <productname>Postgres Pro</productname> uses
+        the collation provider specified with the <command>initdb</command>
+        command for the new cluster. In this case, indexes are rebuilt
+        automatically. To avoid issues with collation-dependent constraints,
+        you are recommended to use <literal>libc</literal> provider when
+        upgrading from vanilla <productname>PostgreSQL</productname>, and
+        omit the provider when upgrading from a previous version of
+        <productname>Postgres Pro</productname>.
       </para>
 
+      <note>
+      <para>
+          If the previous <productname>Postgres Pro</productname> installation
+          contained any indexes or constraints depending on collations
+          other than the default collation of the database, <literal>C</literal>,
+          or <literal>POSIX</literal>, such databases could contain some data
+          that violated the specified constraints and made indexes inconsistent.
+          In such cases, you can only use <application>pg_upgrade</application> to upgrade to
+          <productname>Postgres Pro</productname> 10, as a dump/restore scenario may be impossible.
+          To resolve such issues, <application>pg_upgrade</application> declares such indexes and
+          constraints invalid and creates <filename>reindex_text_indexes.sql</filename>
+          and <filename>validate_text_contraints.sql</filename>, respectively.
+       </para>
+       </note>
+
      <para>
        When building <productname>Postgres Pro</> manually, you must include ICU
        using the <option>--with-icu</option> option. Otherwise, you cannot