Merge branch 'PGPROEE10' into PGPROEE10_scheduler

Author: Vladimir Ershov

configure

@@ -2788,7 +2788,7 @@ fi
 PGPRO_VERSION="$PACKAGE_VERSION.1"
 PGPRO_PACKAGE_NAME="PostgresPro"
 PGPRO_EDITION="enterprise"
-PRODUCT_NAME="PostgresPro Enterprise"
+PRODUCT_NAME="Postgres Pro Enterprise"
 
 
 

configure.in

@@ -41,7 +41,7 @@ PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
 PGPRO_VERSION="$PACKAGE_VERSION.1"
 PGPRO_PACKAGE_NAME="PostgresPro"
 PGPRO_EDITION="enterprise"
-PRODUCT_NAME="PostgresPro Enterprise"
+PRODUCT_NAME="Postgres Pro Enterprise"
 AC_SUBST(PGPRO_PACKAGE_NAME)
 AC_SUBST(PGPRO_EDITION)
 AC_DEFINE_UNQUOTED(PG_VERSION, "$PG_VERSION", [PostgreSQL version as a string])

doc/src/sgml/multimaster.sgml

@@ -66,6 +66,11 @@
     <title>Limitations</title>
     <para>The <filename>multimaster</filename> extension takes care of the database replication in a fully automated way. You can perform write transactions on any node and work with temporary tables on each cluster node simultaneously. However, make sure to take the following replication restrictions into account:</para>
     <itemizedlist>
+      <listitem>
+        <para>
+          Microsoft Windows operating system is not supported.
+        </para>
+      </listitem>
       <listitem>
         <para>
           <filename>multimaster</filename> can only replicate one database

doc/src/sgml/pgpro-scheduler.sgml

@@ -64,6 +64,13 @@
     </listitem>
   </itemizedlist>
 
+  <note>
+    <para>
+     <filename>pgpro_scheduler</filename> is not supported for clusters
+     configured with <xref linkend="multimaster">.
+    </para>
+  </note>
+
   <sect2 id="pgpro-scheduler-installation">
     <title>Installation and Setup</title>
       <para>