Merge branch 'PGPRO9_6' into PGPROEE9_6

Conflicts:
	doc/src/sgml/high-availability.sgml
	doc/src/sgml/installation-bin.sgml
	doc/src/sgml/pgpathman.sgml
	doc/src/sgml/postgres.sgml

Author: dmpgpro

doc/src/sgml/installation-bin.sgml

@@ -784,7 +784,6 @@ service postgresql initdb
             <row>
               <entry>
                 postgrespro-enterprise96-contrib
-                
               </entry>
               <entry>
                 Loadable modules and extensions for server

doc/src/sgml/pgpathman.sgml

@@ -121,7 +121,7 @@ SET pg_pathman.enable = t;</programlisting>
     <para><emphasis role="strong">Contents</emphasis></para>
       <para><link linkend="pg-pathman-choosing-partitioning-strategies">Choosing Partitioning Strategies</link></para>
       <para><link linkend="pg-pathman-running-non-blocking-data-migration">Running Non-Blocking Data Migration</link></para>
-      <para><link linkend="pg-pathman-partitioning-by-expression">Partitioning by Expression</link></para>
+      <para><link linkend="pg-pathman-partitioning-by-expression">Partitioning by a Single Expression</link></para>
       <para><link linkend="pg-pathman-partitioning-by-comp-key">Partitioning by Composite Key</link></para>
     <para>
       As your database grows, indexing mechanisms may become inefficient
@@ -231,7 +231,7 @@ replace_hash_partition(old_partition       REGCLASS,
           when you insert data outside of the already covered range.</para>
         <programlisting>
 create_range_partitions(relation       REGCLASS,
-                        expression      TEXT,
+                        expression     TEXT,
                         start_value    ANYELEMENT,
                         p_interval     ANYELEMENT | INTERVAL,
                         p_count        INTEGER DEFAULT NULL,
@@ -342,10 +342,11 @@ SELECT stop_concurrent_part_task(relation REGCLASS);
       </para></tip>
       </sect3>
       <sect3 id="pg-pathman-partitioning-by-expression">
-        <title>Partitioning by Expression</title>
+        <title>Partitioning by a Single Expression</title>
         <para>
           For both range and hash partitioning strategies, <filename>pg_pathman</filename>
-          supports partitioning by expression that returns a single scalar value. The partitioning expression
+          supports partitioning by expression that returns a single scalar value.
+          The partitioning expression
           can reference a table column, as well as calculate the partitioning key
           based on one or more column values.
           </para>
@@ -488,14 +489,14 @@ create type test_key as (year float8, month float8);
             To enable automatic partition naming, run the <literal>create_naming_sequence()</literal>
             function passing the table name as an argument:
             <programlisting>
-select create_naming_sequence('test');
+SELECT create_naming_sequence('test');
 </programlisting>
           </para>
           <para>
           Register the <structname>test</structname> table with
           <filename>pg_pathman</filename>, specifying the partitioning key you are going to use:
           <programlisting>
-select add_to_pathman_config('test',
+SELECT add_to_pathman_config('test',
                              '( extract(year from logdate),
                                 extract(month from logdate) )::test_key',
                              NULL);
@@ -504,7 +505,7 @@ select add_to_pathman_config('test',
           <para>Create a partition that includes all the data in the range of ten years,
           starting from January of the current year:
           <programlisting>
-select add_range_partition('test',
+SELECT add_range_partition('test',
                            (extract(year from current_date), 1)::test_key,
                            (extract(year from current_date + '10 years'::interval), 1)::test_key);
 </programlisting>

doc/src/sgml/pgprobackup.sgml

@@ -37,7 +37,6 @@ doc/src/sgml/pgprobackup.sgml
    <command>pg_probackup</command>
    <arg choice="plain"><option>del-instance</option></arg>
    <arg choice="plain"><option>-B</option> <replaceable>backupdir</replaceable></arg>
-   <arg choice="plain"><option>-D</option> <replaceable>datadir</replaceable></arg>
    <arg choice="plain"><option>--instance</option> <replaceable>instance_name</replaceable></arg>
   </cmdsynopsis>
   <cmdsynopsis>

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

@@ -1,5 +1,52 @@
 <!-- doc/src/sgml/release-pro-9.6.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
+<sect1 id="release-pro-9-6-4-1">
+  <title>Postgres Pro 9.6.4.1</title>
+  <note>
+    <title>Release Date</title>
+    <simpara>2017-08-14</simpara>
+  </note>
+  <sect2>
+    <title>Overview</title>
+    <para>This release is based on <productname>Postgres Pro</productname>
+      <link linkend="release-pro-9-6-3-3">9.6.3.3</link> and
+      <productname>PostgreSQL</productname> <link linkend="release-9-6-4">9.6.4</link>.</para>
+    <para>Major enhancements over <productname>Postgres Pro</productname>
+      9.6.3.3 include:</para>
+    <itemizedlist>
+      <listitem>
+        <para>Fixed an incorrect catalog check in <literal>pg_dump</literal>
+          that has been added with the previous release.</para>
+      </listitem>
+      <listitem>
+        <para>Added distribution for Ubuntu 17.10.</para>
+      </listitem>
+    </itemizedlist>
+  </sect2>
+  <sect2>
+    <title>Migration to Version 9.6.4.1</title>
+    <para>A dump/restore using <xref linkend="app-pg-dumpall">, or
+        use of <xref linkend="pgupgrade">, is required for those
+        wishing to migrate data from any previous major release.
+    </para>
+    <para>A dump/restore is not required for those running 9.6.3.3.</para>
+    <para>However, if you are upgrading from vanilla PostgreSQL 9.6.x, some
+      catalog changes should be applied.
+    </para>
+    <para>If you use binary packages, and your database is in the default
+      location, this upgrade should be performed automatically. If you've
+      compiled Postgres Pro from source or create your database in a
+      non-default location, running <literal>initdb</literal> manually, you
+      should run <literal>pgpro_upgrade</literal> script provided in this
+      distribution.
+    </para>
+    <para>Before running the script, you should stop postgres service.
+      Script should be run on behalf of the user owning the database
+      (typically postgres) and PGDATA environment variable should be
+      set to the directory where database resides.
+    </para>
+  </sect2>
+</sect1>
 <sect1 id="release-pro-9-6-3-3">
   <title>Postgres Pro 9.6.3.3</title>
   <note>