Merge branch 'PGPRO9_6' into PGPRO9_6_pathman

dmpgpro · dmpgpro · commit 0963e9c471f6 · 2016-10-11T18:50:15.000+03:00
diff --git a/contrib/pg_query_state/pg_query_state.c b/contrib/pg_query_state/pg_query_state.c
@@ -477,7 +477,7 @@ pg_query_state(PG_FUNCTION_ARGS)
 	FuncCallContext	*funcctx;
 	MemoryContext	oldcontext;
 	pg_qs_fctx		*fctx;
-	const int		N_ATTRS = 5;
+#define		N_ATTRS  5
 	pid_t			pid = PG_GETARG_INT32(0);
 
 	if (SRF_IS_FIRSTCALL())
diff --git a/doc/src/sgml/pgarman.sgml b/doc/src/sgml/pgarman.sgml
@@ -389,8 +389,7 @@ STATUS=OK
       <title>RESTORE OPTIONS</title>
       <para>
         The parameters whose name start are started with --recovery
-        refer to the same parameters as the ones in recovery.confin
-        recovery.conf.
+        refer to the same parameters as the ones in recovery.conf.
       </para>
 <literallayout><emphasis role="strong">--recovery-target-timeline</emphasis>=<emphasis>TIMELINE</emphasis>:
  Specifies recovering into a particular timeline. If not specified, the current timeline is used.</literallayout>
diff --git a/doc/src/sgml/pgpathman.sgml b/doc/src/sgml/pgpathman.sgml
@@ -395,7 +395,7 @@ set_init_callback(relation REGCLASS, callback REGPROC DEFAULT 0)
   </sect2>
   <sect2 id="views-and-tables">
     <title>Views and tables</title>
-    <sect3 id="pathman_config-main-config-storage">
+    <sect3 id="pathman-config-main-config-storage">
       <title><literal>pathman_config</literal> --- main config
       storage</title>
       <programlisting>
@@ -411,7 +411,7 @@ CREATE TABLE IF NOT EXISTS pathman_config (
         This table stores a list of partitioned tables.
       </para>
     </sect3>
-    <sect3 id="pathman_config_params-optional-parameters">
+    <sect3 id="pathman-config-params-optional-parameters">
       <title><literal>pathman_config_params</literal> --- optional
       parameters</title>
       <programlisting>
@@ -426,7 +426,7 @@ CREATE TABLE IF NOT EXISTS pathman_config_params (
         behavior.
       </para>
     </sect3>
-    <sect3 id="pathman_concurrent_part_tasks-currently-running-partitioning-workers">
+    <sect3 id="pathman-concurrent-part-tasks-currently-running-partitioning-workers">
       <title><literal>pathman_concurrent_part_tasks</literal> ---
       currently running partitioning workers</title>
       <programlisting>
@@ -450,7 +450,7 @@ AS SELECT * FROM show_concurrent_part_tasks();
         tasks.
       </para>
     </sect3>
-    <sect3 id="pathman_partition_list-list-of-all-existing-partitions">
+    <sect3 id="pathman-partition-list-list-of-all-existing-partitions">
       <title><literal>pathman_partition_list</literal> --- list of all
       existing partitions</title>
       <programlisting>
@@ -903,7 +903,7 @@ WHERE id = any (SELECT * FROM some_table limit 4);
         (3 rows)
       </programlisting>
     </sect3>
-    <sect3 id="disabling-pg_pathman">
+    <sect3 id="disabling-pg-pathman">
       <title>Disabling <literal>pg_pathman</literal></title>
       <para>
         There are several user-accessible
diff --git a/doc/src/sgml/release-pro-9.6.sgml b/doc/src/sgml/release-pro-9.6.sgml
@@ -4,13 +4,13 @@
   <title>Postgres Pro 9.6.0.1</title>
   <note>
     <title>Release Date</title>
-    <simpara>2016-10-10</simpara>
+    <simpara>2016-10-12</simpara>
   </note>
   <sect2>
     <title>Overview</title>
     <para>This release is based on <productname>PostgreSQL</productname>
       9.6.0</para>
-    <para>Major enhancements over <productname>PostgresSQL</productname>
+    <para>Major enhancements over <productname>PostgreSQL</productname>
       9.6.0 include:</para>
     <para>Core patches from Postgres Pro 9.5 has been applied:</para>
     <itemizedlist>
