Merge branch 'PGPROEE10' into PGPROEE10_pg_shardman

Author: vbwagner

config/perl.m4

@@ -48,19 +48,23 @@ AC_DEFUN([PGAC_CHECK_PERL_CONFIGS],
 
 # PGAC_CHECK_PERL_EMBED_CCFLAGS
 # -----------------------------
-# We selectively extract stuff from $Config{ccflags}.  We don't really need
-# anything except -D switches, and other sorts of compiler switches can
-# actively break things if Perl was compiled with a different compiler.
-# Moreover, although Perl likes to put stuff like -D_LARGEFILE_SOURCE and
-# -D_FILE_OFFSET_BITS=64 here, it would be fatal to try to compile PL/Perl
-# to a different libc ABI than core Postgres uses.  The available information
-# says that all the symbols that affect Perl's own ABI begin with letters,
-# so it should be sufficient to adopt -D switches for symbols not beginning
-# with underscore.  An exception is that we need to let through
-# -D_USE_32BIT_TIME_T if it's present.  (We probably could restrict that to
-# only get through on Windows, but for the moment we let it through always.)
-# For debugging purposes, let's have the configure output report the raw
-# ccflags value as well as the set of flags we chose to adopt.
+# We selectively extract stuff from $Config{ccflags}.  For debugging purposes,
+# let's have the configure output report the raw ccflags value as well as the
+# set of flags we chose to adopt.  We don't really need anything except -D
+# switches, and other sorts of compiler switches can actively break things if
+# Perl was compiled with a different compiler.  Moreover, although Perl likes
+# to put stuff like -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 here, it
+# would be fatal to try to compile PL/Perl to a different libc ABI than core
+# Postgres uses.  The available information says that most symbols that affect
+# Perl's own ABI begin with letters, so it's almost sufficient to adopt -D
+# switches for symbols not beginning with underscore.  Some exceptions are the
+# Windows-specific -D_USE_32BIT_TIME_T and -D__MINGW_USE_VC2005_COMPAT; see
+# Mkvcbuild.pm for details.  We absorb the former when Perl reports it.  Perl
+# never reports the latter, and we don't attempt to deduce when it's needed.
+# Consequently, we don't support using MinGW to link to MSVC-built Perl.  As
+# of 2017, all supported ActivePerl and Strawberry Perl are MinGW-built.  If
+# that changes or an MSVC-built Perl distribution becomes prominent, we can
+# revisit this limitation.
 AC_DEFUN([PGAC_CHECK_PERL_EMBED_CCFLAGS],
 [AC_REQUIRE([PGAC_PATH_PERL])
 AC_MSG_CHECKING([for CFLAGS recommended by Perl])

doc/src/sgml/demodb-bookings.sgml

@@ -754,9 +754,9 @@ Referenced by:
    <para>
     Some fields in the demo database are available in English and Russian.
     Translations to other languages are not provided, but are easy to add.
-    The <function>bookings.lang</function> function selects the language
-    in which to display these fields, returning the value of the
-    <parameter>bookings.lang</parameter> parameter.
+    The <function>bookings.lang</function> returns the value of the
+    <parameter>bookings.lang</parameter> parameter, that is, the language
+    in which these fields will be displayed.
    </para>
 
    <para>
@@ -811,6 +811,9 @@ ALTER DATABASE demo SET bookings.lang = en;
     For other methods of settings configuration parameters,
     see <xref linkend="config-setting">.
    </para>
+
+   <para>In the examples below, the English language is selected for translatable fields.
+   </para>
   </sect2>
 
 
@@ -822,7 +825,7 @@ ALTER DATABASE demo SET bookings.lang = en;
    </para>
 
    <para>
-    The results displayed below were received on a small database version (demo_small) of August 15, 2017.
+    The results displayed below were received on a small database version (demo-small) of August 15, 2017.
     If the same queries return different data on your system,
     check your demo database version  (using the <function>bookings.now</function> function).
     Some minor deviations may be caused by the difference between your local time and Moscow time,