Merge branch 'PGPROEE9_6_ALPHA' into PGPROEE9_6_scheduler

dmpgpro · dmpgpro · commit 915b02317131 · 2017-05-02T11:51:05.000+03:00
diff --git a/doc/src/sgml/chkpass.sgml b/doc/src/sgml/chkpass.sgml
@@ -32,7 +32,7 @@
   passwords without re-encrypting them.  If you want the encrypted password
   without the colon then use the <function>raw()</> function.
   This allows you to use the
-  type with things like Apache's <literal>Auth_&productname;</> module.
+  type with things like Apache's <literal>Auth_PostgreSQL</> module.
  </para>
 
  <para>
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
@@ -42,6 +42,7 @@ VERSION_NUM = @PG_VERSION_NUM@
 
 PGPRO_VERSION = @PGPRO_VERSION@
 PGPRO_PACKAGE_NAME = @PGPRO_PACKAGE_NAME@
+PGPRO_EDITION = @PGPRO_EDITION@
 
 # Set top_srcdir, srcdir, and VPATH.
 ifdef PGXS
